jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 71cf75f2a7e203f310e7d961c7da99f854319efe

Authored by liquanyu
1 parent 451d2bac69
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

服务

Showing 10 changed files with 92 additions and 8 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java View file @ 71cf75f
... ... @@ -38,6 +38,15 @@
38 38  
39 39 private BigDecimal devicePrice;
40 40 private Integer deviceCon;//0 无 1全程
  41 + private BigDecimal weekPrice;
  42 +
  43 + public BigDecimal getWeekPrice() {
  44 + return weekPrice;
  45 + }
  46 +
  47 + public void setWeekPrice(BigDecimal weekPrice) {
  48 + this.weekPrice = weekPrice;
  49 + }
41 50  
42 51 public BigDecimal getDevicePrice() {
43 52 return devicePrice;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctServiceQuery.java View file @ 71cf75f
... ... @@ -38,6 +38,15 @@
38 38  
39 39 private BigDecimal devicePrice;
40 40 private Integer deviceCon;//0 无 1全程
  41 + private BigDecimal weekPrice;
  42 +
  43 + public BigDecimal getWeekPrice() {
  44 + return weekPrice;
  45 + }
  46 +
  47 + public void setWeekPrice(BigDecimal weekPrice) {
  48 + this.weekPrice = weekPrice;
  49 + }
41 50  
42 51 public BigDecimal getDevicePrice() {
43 52 return devicePrice;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContent.java View file @ 71cf75f
... ... @@ -49,6 +49,17 @@
49 49 private List<Map> doctIds = new ArrayList<>();
50 50 private Integer syncStatus;
51 51  
  52 + //单周服务价格
  53 + private BigDecimal weekPrice;
  54 +
  55 + public BigDecimal getWeekPrice() {
  56 + return weekPrice;
  57 + }
  58 +
  59 + public void setWeekPrice(BigDecimal weekPrice) {
  60 + this.weekPrice = weekPrice;
  61 + }
  62 +
52 63 public Integer getSyncStatus() {
53 64 return syncStatus;
54 65 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalServiceContentQuery.java View file @ 71cf75f
... ... @@ -41,6 +41,17 @@
41 41 private Integer status;
42 42 private Integer syncStatus;
43 43  
  44 + //单周服务价格
  45 + private BigDecimal weekPrice;
  46 +
  47 + public BigDecimal getWeekPrice() {
  48 + return weekPrice;
  49 + }
  50 +
  51 + public void setWeekPrice(BigDecimal weekPrice) {
  52 + this.weekPrice = weekPrice;
  53 + }
  54 +
44 55 public Integer getSyncStatus() {
45 56 return syncStatus;
46 57 }
platform-biz-service/src/main/resources/mainOrm/master/HospitalDoctService.xml View file @ 71cf75f
... ... @@ -12,12 +12,13 @@
12 12 <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
13 13 <result column="status" property="status" jdbcType="INTEGER"/>
14 14 <result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
  15 + <result column="weekPrice" property="weekPrice" jdbcType="DECIMAL"/>
15 16 </resultMap>
16 17  
17 18  
18 19 <insert id="addHospitalDoctService" parameterType="com.lyms.platform.permission.model.HospitalDoctService">
19   -insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon) values
20   -(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon})
  20 +insert into hospital_doct_service (id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon,weekPrice) values
  21 +(#{id},#{hospServiceId},#{doctId},#{hospId},#{doctPrice},#{status},#{syncStatus},#{devicePrice},#{deviceCon},#{weekPrice})
21 22 </insert>
22 23  
23 24  
... ... @@ -39,6 +40,9 @@
39 40 <if test="devicePrice != null">
40 41 devicePrice = #{devicePrice,jdbcType=DECIMAL},
41 42 </if>
  43 + <if test="weekPrice != null">
  44 + weekPrice = #{weekPrice,jdbcType=DECIMAL},
  45 + </if>
42 46 <if test="status != null and status >= 0">
43 47 status = #{status,jdbcType=INTEGER},
44 48 </if>
... ... @@ -95,6 +99,9 @@
95 99 <if test="devicePrice != null">
96 100 and devicePrice = #{devicePrice,jdbcType=DECIMAL}
97 101 </if>
  102 + <if test="weekPrice != null">
  103 + and weekPrice = #{weekPrice,jdbcType=DECIMAL}
  104 + </if>
98 105 <if test="status != null and status >= 0">
99 106 and status = #{status,jdbcType=INTEGER}
100 107 </if>
... ... @@ -111,7 +118,7 @@
111 118  
112 119 <select id="queryHospitalDoctService" resultMap="HospitalDoctServiceResultMap"
113 120 parameterType="com.lyms.platform.permission.model.HospitalDoctServiceQuery">
114   - select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon
  121 + select id,hosp_service_id,doct_id,hosp_id,doct_price,status,sync_status,devicePrice,deviceCon,weekPrice
115 122 from hospital_doct_service
116 123 <include refid="HospitalDoctServiceCondition"/>
117 124 <include refid="orderAndLimit"/>
platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml View file @ 71cf75f
... ... @@ -12,12 +12,14 @@
12 12 <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
13 13 <result column="status" property="status" jdbcType="INTEGER"/>
14 14 <result column="sync_status" property="syncStatus" jdbcType="INTEGER"/>
  15 +
  16 + <result column="weekPrice" property="weekPrice" jdbcType="DECIMAL"/>
15 17 </resultMap>
16 18  
17 19  
18 20 <insert id="addHospitalServiceContent" parameterType="com.lyms.platform.permission.model.HospitalServiceContent">
19   -insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status) values
20   -(#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status},#{syncStatus})
  21 +insert into hospital_service_content (id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice) values
  22 +(#{id},#{hospitalId},#{serType},#{serPrice},#{createDate},#{createUser},#{status},#{syncStatus},#{weekPrice})
21 23 </insert>
22 24  
23 25  
... ... @@ -33,6 +35,9 @@
33 35 <if test="serPrice != null">
34 36 ser_price = #{serPrice,jdbcType=DECIMAL},
35 37 </if>
  38 + <if test="weekPrice != null">
  39 + weekPrice = #{weekPrice,jdbcType=DECIMAL},
  40 + </if>
36 41 <if test="createDate != null">
37 42 create_date = #{createDate,jdbcType=TIMESTAMP},
38 43 </if>
... ... @@ -56,7 +61,7 @@
56 61  
57 62  
58 63 <select id="getHospitalServiceContent" resultMap="HospitalServiceContentResultMap" parameterType="java.lang.String">
59   -select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status
  64 +select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice
60 65 from hospital_service_content where id = #{id,jdbcType=VARCHAR}
61 66 </select>
62 67  
... ... @@ -86,6 +91,9 @@
86 91 <if test="serPrice != null">
87 92 and ser_price = #{serPrice,jdbcType=DECIMAL}
88 93 </if>
  94 + <if test="weekPrice != null">
  95 + and weekPrice = #{weekPrice,jdbcType=DECIMAL}
  96 + </if>
89 97 <if test="createDate != null">
90 98 and create_date = #{createDate,jdbcType=TIMESTAMP}
91 99 </if>
... ... @@ -104,7 +112,7 @@
104 112  
105 113 <select id="queryGroupHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
106 114 parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
107   - select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user,sync_status from hospital_service_content
  115 + select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user,sync_status,weekPrice from hospital_service_content
108 116 <include refid="HospitalServiceContentCondition"/>
109 117 group by hospital_id
110 118 <include refid="orderAndLimit"/>
... ... @@ -120,7 +128,7 @@
120 128  
121 129 <select id="queryHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
122 130 parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
123   - select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status
  131 + select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_status,weekPrice
124 132 from hospital_service_content
125 133 <include refid="HospitalServiceContentCondition"/>
126 134 <include refid="orderAndLimit"/>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java View file @ 71cf75f
... ... @@ -241,6 +241,8 @@
241 241 result.setStatus(hs.getStatus());
242 242 result.setDeviceCon(hs.getDeviceCon());
243 243 result.setDevicePrice(hs.getDevicePrice());
  244 +
  245 + result.setWeekPrice(hs.getWeekPrice());
244 246 if (StringUtils.isNum(hs.getDoctId())) {
245 247 result.setDoctName(docterMap.get(Integer.parseInt(hs.getDoctId())));
246 248 }
... ... @@ -317,6 +319,7 @@
317 319 result.setSerPrice(hs.getSerPrice());
318 320 result.setSerType(hs.getSerType());
319 321 result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
  322 + result.setWeekPrice(hs.getWeekPrice());
320 323 if (hs.getStatus() != null) {
321 324 result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
322 325 }
... ... @@ -375,6 +378,7 @@
375 378 oldHosDoct.setSyncStatus(0);
376 379 oldHosDoct.setDeviceCon(hds.getDeviceCon());
377 380 oldHosDoct.setDevicePrice(hds.getDevicePrice());
  381 + oldHosDoct.setWeekPrice(hds.getWeekPrice());
378 382 hospitalDoctService.updateHospitalDoctService(oldHosDoct);
379 383 }
380 384 } else {
... ... @@ -389,6 +393,7 @@
389 393 hospitalDoctSer.setSyncStatus(0);
390 394 hospitalDoctSer.setDeviceCon(hds.getDeviceCon());
391 395 hospitalDoctSer.setDevicePrice(hds.getDevicePrice());
  396 + hospitalDoctSer.setWeekPrice(hds.getWeekPrice());
392 397 hospitalDoctService.updateHospitalDoctService(hospitalDoctSer);
393 398 } else {
394 399 hds.setId(UUID.randomUUID().toString().replace("-", ""));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 71cf75f
... ... @@ -1148,6 +1148,7 @@
1148 1148 map.put("ser_price", serviceContent.getSerPrice());
1149 1149 map.put("ser_type", serviceContent.getSerType());
1150 1150 map.put("status", serviceContent.getStatus());
  1151 + map.put("weekPrice", serviceContent.getWeekPrice());
1151 1152 return map;
1152 1153 }
1153 1154  
... ... @@ -1161,6 +1162,7 @@
1161 1162 map.put("status", hospitalDoctService.getStatus());
1162 1163 map.put("devicePrice", hospitalDoctService.getDevicePrice());
1163 1164 map.put("deviceCon", hospitalDoctService.getDeviceCon());
  1165 + map.put("weekPrice", hospitalDoctService.getWeekPrice());
1164 1166 return map;
1165 1167 }
1166 1168  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalDoctSerResult.java View file @ 71cf75f
... ... @@ -50,6 +50,16 @@
50 50 private BigDecimal devicePrice;
51 51 private Integer deviceCon;//0 无 1全程
52 52  
  53 + private BigDecimal weekPrice;
  54 +
  55 + public BigDecimal getWeekPrice() {
  56 + return weekPrice;
  57 + }
  58 +
  59 + public void setWeekPrice(BigDecimal weekPrice) {
  60 + this.weekPrice = weekPrice;
  61 + }
  62 +
53 63 public BigDecimal getDevicePrice() {
54 64 return devicePrice;
55 65 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HospitalServiceContentResult.java View file @ 71cf75f
... ... @@ -57,6 +57,18 @@
57 57 */
58 58 private List<HospitalDoctSerResult> hospitalDoctServices = new ArrayList<>();
59 59  
  60 + //单周服务价格
  61 + private BigDecimal weekPrice;
  62 +
  63 +
  64 + public BigDecimal getWeekPrice() {
  65 + return weekPrice;
  66 + }
  67 +
  68 + public void setWeekPrice(BigDecimal weekPrice) {
  69 + this.weekPrice = weekPrice;
  70 + }
  71 +
60 72 public List<HospitalDoctSerResult> getHospitalDoctServices() {
61 73 return hospitalDoctServices;
62 74 }