lighter 4 rokov pred
rodič
commit
bef6bae844

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/markmtfees/MarkMtFeeParam.java

@@ -6,6 +6,9 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
+/**
+ * @author dj
+ */
 @Data
 public class MarkMtFeeParam {
     @NotNull(message = "医保类别不能为空。")

+ 16 - 7
src/main/java/thyyxxk/webserver/entity/markmtfees/MzReceipt.java

@@ -5,6 +5,9 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * @author dj
+ */
 @Data
 public class MzReceipt {
     private String drugName;
@@ -21,13 +24,15 @@ public class MzReceipt {
     private String serial;
     private String serialNo;
     private Date chargeDate;
-    // 00 项目,其他 药品
+    /**
+     * 00 项目,其他 药品
+     * */
     private String groupNo;
     private String specification;
     private Integer confirmFlag;
     private String instructionText;
     private Integer drugWin;
-    private Date priceTime;
+    private String priceTime;
     private String dosage;
     private String mediItemType;
     private String billItemCode;
@@ -97,20 +102,24 @@ public class MzReceipt {
     }
 
     public String getMediItemType() {
-        if (billItemCode.trim().equals("TC")) {
+        if ("TC".equals(billItemCode.trim())) {
             return "TC";
         }
         switch (billItemCode.trim()) {
-            case "010": // 西药
+            // 西药
+            case "010":
             case "1":
                 return "1";
-            case "011": // 中成药
+            // 中成药
+            case "011":
             case "2":
                 return "2";
-            case "012": // 中草药
+            // 中草药
+            case "012":
             case "3":
                 return "3";
-            default:    // 其他
+            // 其他
+            default:
                 return "0";
         }
     }

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/markmtfees/OrderNo.java

@@ -4,6 +4,9 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
+/**
+ * @author dj
+ */
 @Data
 public class OrderNo {
     private String patientId;

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/yibao/patient/GetFeesParam.java

@@ -2,6 +2,9 @@ package thyyxxk.webserver.entity.yibao.patient;
 
 import lombok.Data;
 
+/**
+ * @author dj
+ */
 @Data
 public class GetFeesParam {
     private String inpatientNo;

+ 3 - 0
src/main/java/thyyxxk/webserver/rabbitmq/MsgConsumer.java

@@ -7,6 +7,9 @@ import thyyxxk.webserver.websocket.WebSocketServer;
 
 import java.nio.charset.StandardCharsets;
 
+/**
+ * @author dj
+ */
 @Component
 public class MsgConsumer {
 

+ 6 - 3
src/main/java/thyyxxk/webserver/service/yibao/PatientService.java

@@ -25,6 +25,9 @@ import java.util.*;
 import static thyyxxk.webserver.utils.YibaoHttpUtil.httpPost;
 import static thyyxxk.webserver.utils.FilterUtil.cast;
 
+/**
+ * @author dj
+ */
 @Slf4j
 @Service
 public class PatientService {
@@ -170,7 +173,7 @@ public class PatientService {
         }
     }
     private ResultVo<Object> queryHnsyb(YbRegisterInfoParam param) {
-        ResultVo<Object> resultVo = httpPost("getPersonInfo", param, "02");
+        ResultVo<Object> resultVo = httpPost("getPersonInfo", param, ResponceType.HUNAN_PROVINCIAL_MEDICAL_INSURANCE);
         if (resultVo.getCode() == ExceptionEnum.SUCCESS.getCode()) {
             Map<String, String> bizInfo = cast(resultVo.getData());
             log.info("查询省医保业务信息结果:{}", bizInfo);
@@ -210,7 +213,7 @@ public class PatientService {
         param.setFromDate(fromDate);
         param.setToDate(fromDate);
         log.info("查询市医保业务信息:{}", param);
-        ResultVo<Object> resultVo = httpPost("queryRegisterInfo", param, "03");
+        ResultVo<Object> resultVo = httpPost("queryRegisterInfo", param, ResponceType.CHANGSHA_CITY_RESIDENTS_MEDICAL_INSURANCE);
         if (resultVo.getCode() == ExceptionEnum.SUCCESS.getCode()) {
             String[] infos = resultVo.getData().toString().split("\t");
             YbRegisterInfo info = new YbRegisterInfo();
@@ -243,7 +246,7 @@ public class PatientService {
         }
         param.setMemberSysNo(memberSysNo);
         log.info("查询新农合业务信息:{}", param);
-        ResultVo<Object> resultVo = httpPost("getPersonInfo", param, "04");
+        ResultVo<Object> resultVo = httpPost("getPersonInfo", param, ResponceType.NEW_RURAL_COOPERATIVE_MEDICAL_INSURANCE);
         if (resultVo.getCode() != ExceptionEnum.SUCCESS.getCode()) {
             return resultVo;
         } else {