提交merge1.3

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientDischargeMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.yb.mapper.InpatientDischargeMapper">
+
+
+</mapper>

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientFeeDetailMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.yb.mapper.InpatientFeeDetailMapper">
+
+</mapper>

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientPreSettleMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.yb.mapper.InpatientPreSettleMapper">
+
+</mapper>

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegInfoUpdateRecordeMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper">
+
+</mapper>

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientRegMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.yb.mapper.InpatientRegMapper">
+
+    <select id="selectInpatientInfoByEncounterId" resultType="com.openhis.yb.domain.InpatientReg">
+        SELECT
+        id,
+        psn_no,
+        insutype,
+        coner_name,
+        tel,
+        begntime,
+        mdtrt_cert_type,
+        mdtrt_cert_no,
+        med_type,
+        ipt_no,
+        medrcdno,
+        atddr_no,
+        chfpdr_name,
+        adm_diag_dscr,
+        adm_dept_codg,
+        adm_dept_name,
+        adm_bed,
+        dscg_maindiag_code,
+        dscg_maindiag_name,
+        main_cond_dscr,
+        dise_codg,
+        dise_name,
+        oprn_oprt_code,
+        oprn_oprt_name,
+        fpsc_no,
+        matn_type,
+        birctrl_type,
+        latechb_flag,
+        geso_val,
+        fetts,
+        fetus_cnt,
+        pret_flag,
+        birctrl_matn_date,
+        dise_type_code,
+        exp_content,
+        insuplc_admdvs,
+        mdtrtarea_admvs,
+        mdtrt_id
+        FROM yb_inpatient_reg inreg
+        LEFT JOIN adm_encounter enc ON inreg.ipt_no = enc.bus_no AND enc.delete_flag = '0'
+        WHERE enc.id = #{encounterId}
+    </select>
+</mapper>

openhis-server-new/openhis-domain/src/main/resources/mapper/yb/InpatientSettleMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.yb.mapper.InpatientSettleMapper">
+
+</mapper>