jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0dff189ca9a19b4cd302beac844bc9d14672226c

Authored by yangfei
1 parent 471ed12206
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

回院提醒流程修改

Showing 5 changed files with 67 additions and 3 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java View file @ 0dff189
... ... @@ -103,6 +103,18 @@
103 103 * 住院类型(1-分娩住院、2-其他住院)
104 104 */
105 105 private Integer hospitType;
  106 + /**
  107 + * 是否实际住院1-是，2-否
  108 + */
  109 + private Integer isReality;
  110 +
  111 + public Integer getIsReality() {
  112 + return isReality;
  113 + }
  114 +
  115 + public void setIsReality(Integer isReality) {
  116 + this.isReality = isReality;
  117 + }
106 118  
107 119 public Integer getHospitType() {
108 120 return hospitType;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java View file @ 0dff189
... ... @@ -148,6 +148,19 @@
148 148 */
149 149 private String sql;
150 150  
  151 + /**
  152 + * 是否实际住院1-未住院，2-已住院
  153 + */
  154 + private Integer isReality;
  155 +
  156 + public Integer getIsReality() {
  157 + return isReality;
  158 + }
  159 +
  160 + public void setIsReality(Integer isReality) {
  161 + this.isReality = isReality;
  162 + }
  163 +
151 164 public Date getHospitStartDate() {
152 165 return hospitStartDate;
153 166 }
platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml View file @ 0dff189
... ... @@ -28,11 +28,12 @@
28 28 <result column="hospit_status" property="hospitStatus" jdbcType="INTEGER"/>
29 29 <result column="hospit_date" property="hospitDate" jdbcType="TIMESTAMP"/>
30 30 <result column="hospit_type" property="hospitType" jdbcType="INTEGER"/>
  31 + <result column="is_reality" property="isReality" jdbcType="INTEGER"/>
31 32 </resultMap>
32 33  
33 34  
34 35 <insert id="addPatientMarkHospital" parameterType="com.lyms.platform.permission.model.PatientMarkHospital">
35   - insert into patient_mark_hospital (id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type) values (#{id},#{patientId},#{pid},#{backStatus},#{backResult},#{backDoctor},#{backDate},#{backMakeDate},#{backRemark},#{backFailure},#{inHospitStatus},#{inHospitResult},#{inHospitDoctor},#{inHospitDate},#{inHospitMakeDate},#{inHospitRemark},#{inHospitFailure},#{makeInHospitDate},#{makeDate},#{makeDoctor},#{makeRemark},#{hospitalId},#{hospitStatus},#{hospitDate},#{hospitType})
  36 + insert into patient_mark_hospital (id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type,is_reality) values (#{id},#{patientId},#{pid},#{backStatus},#{backResult},#{backDoctor},#{backDate},#{backMakeDate},#{backRemark},#{backFailure},#{inHospitStatus},#{inHospitResult},#{inHospitDoctor},#{inHospitDate},#{inHospitMakeDate},#{inHospitRemark},#{inHospitFailure},#{makeInHospitDate},#{makeDate},#{makeDoctor},#{makeRemark},#{hospitalId},#{hospitStatus},#{hospitDate},#{hospitType},#{isReality})
36 37 </insert>
37 38  
38 39  
... ... @@ -111,6 +112,9 @@
111 112 <if test="hospitType != null">
112 113 hospit_type = #{hospitType,jdbcType=INTEGER},
113 114 </if>
  115 + <if test="isReality != null">
  116 + is_reality = #{isReality,jdbcType=INTEGER},
  117 + </if>
114 118 </set>
115 119 where id = #{id,jdbcType=VARCHAR}
116 120 </update>
... ... @@ -122,7 +126,7 @@
122 126  
123 127  
124 128 <select id="getPatientMarkHospital" resultMap="PatientMarkHospitalResultMap" parameterType="java.lang.String">
125   - select id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type
  129 + select id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type,is_reality
126 130 from patient_mark_hospital where id = #{id,jdbcType=VARCHAR}
127 131 </select>
128 132  
... ... @@ -270,6 +274,9 @@
270 274 <if test="hospitType != null">
271 275 and hospit_type = #{hospitType,jdbcType=INTEGER}
272 276 </if>
  277 + <if test="isReality != null">
  278 + and is_reality = #{isReality,jdbcType=INTEGER}
  279 + </if>
273 280 <if test="sql != null">
274 281 ${sql}
275 282 </if>
... ... @@ -473,7 +480,7 @@
473 480 <select id="queryPatientMarkHospital" resultMap="PatientMarkHospitalResultMap"
474 481 parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
475 482 select
476   - id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type
  483 + id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type,is_reality
477 484 from patient_mark_hospital
478 485 <include refid="PatientMarkHospitalCondition"/>
479 486 <include refid="orderAndLimit"/>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java View file @ 0dff189
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 7 import com.lyms.platform.common.enums.MakeHospitalEnums;
8 8 import com.lyms.platform.common.enums.OptActionEnums;
  9 +import com.lyms.platform.common.enums.VomitEnums;
9 10 import com.lyms.platform.common.result.BaseListResponse;
10 11 import com.lyms.platform.common.result.BaseObjectResponse;
11 12 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -916,6 +917,13 @@
916 917 }
917 918 result.setBackStatus(ps.getBackStatus());
918 919  
  920 + result.setIsReality(ps.getIsReality());
  921 + if(ps.getIsReality()!=null){
  922 + result.setIsRealityStr(VomitEnums.getName(String.valueOf(ps.getIsReality())));
  923 + }else{
  924 + result.setIsRealityStr("--");
  925 + }
  926 +
919 927 result.setBackStatusStr(ps.getBackStatus() == 1 ? "待提醒" : "已提醒");
920 928 result.setBackResult(ps.getBackResult());
921 929 if (ps.getBackResult() != null) {
... ... @@ -1080,6 +1088,7 @@
1080 1088 public void synLlHisData(int offset, int page) {
1081 1089 System.out.println("同步查询乐陵住院数据");
1082 1090 PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
  1091 + patientMarkHospQuery.setHospitStatus(1);
1083 1092 patientMarkHospQuery.setSort("hospit_date");
1084 1093 patientMarkHospQuery.setNeed("y");
1085 1094 patientMarkHospQuery.setOffset(offset);
... ... @@ -1120,6 +1129,8 @@
1120 1129 for (Map<String, String> map : makePatients) {
1121 1130 String inHospDiagn = map.get("inHospDiagn");
1122 1131 int hospType = getHospitType(inHospDiagn);
  1132 + //默认实际住院
  1133 + ps.setIsReality(1);
1123 1134 ps.setHospitStatus(2);
1124 1135 ps.setHospitType(hospType);
1125 1136 String inHospDate = map.get("inHospDate");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java View file @ 0dff189
... ... @@ -138,6 +138,27 @@
138 138 */
139 139 private Integer hospitType;
140 140 private String hospitTypeStr;
  141 + /**
  142 + * 是否实际住院1-是，2-否
  143 + */
  144 + private Integer isReality;
  145 + private String isRealityStr;
  146 +
  147 + public Integer getIsReality() {
  148 + return isReality;
  149 + }
  150 +
  151 + public void setIsReality(Integer isReality) {
  152 + this.isReality = isReality;
  153 + }
  154 +
  155 + public String getIsRealityStr() {
  156 + return isRealityStr;
  157 + }
  158 +
  159 + public void setIsRealityStr(String isRealityStr) {
  160 + this.isRealityStr = isRealityStr;
  161 + }
141 162  
142 163 public String getId() {
143 164 return id;