修复农合上传身份证失败的问题。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>6.2</version>
+    <version>6.4</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
 

src/main/java/thyyxxk/webserver/dao/his/yibao/PatientDao.java

@@ -51,7 +51,7 @@ public interface PatientDao {
             "responce_type=rtrim(isnull(isnull(a.responce_type, b.responce_type), '')), " +
             "xnh_hasreferral=rtrim(isnull(b.xnh_hasreferral, 0)), " +
             "xnh_referralno=rtrim(b.xnh_referralno), " +
-            "yb_type=rtrim(isnull(a.yb_type, '')), " +
+            "yb_type=rtrim(isnull(a.yb_type, b.yb_type)), " +
             "treat_type=rtrim(isnull(isnull(a.treat_type, b.treat_type), '')), " +
             "icd_code=rtrim(a.icd_code), " +
             "icd_text=rtrim(a.icd_text), " +

src/main/java/thyyxxk/webserver/dao/his/yibao/YbVerifyDao.java

@@ -9,6 +9,9 @@ import thyyxxk.webserver.entity.yibao.ybverify.IdCardUpload;
 
 import java.util.List;
 
+/**
+ * @author dj
+ */
 @Mapper
 public interface YbVerifyDao {
 

src/main/java/thyyxxk/webserver/service/yibao/YbVerifyService.java

@@ -1,7 +1,5 @@
 package thyyxxk.webserver.service.yibao;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
@@ -11,10 +9,12 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.yibao.patient.Patient;
 import thyyxxk.webserver.entity.yibao.ybverify.CancelRegisterRequest;
 import thyyxxk.webserver.entity.yibao.ybverify.IdCardUpload;
+import thyyxxk.webserver.utils.FilterUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.util.List;
+import java.util.Map;
 
 import static thyyxxk.webserver.utils.YibaoHttpUtil.httpPost;
 
@@ -36,15 +36,12 @@ public class YbVerifyService {
         if (param.getResponceType().equals(ResponceType.NEW_RURAL_COOPERATIVE_MEDICAL_INSURANCE)) {
             ResultVo<Object> resultVo = httpPost("getFamilyMember", param, "04");
             if (resultVo.getCode() == ExceptionEnum.SUCCESS.getCode()) {
-                JSONObject obj = (JSONObject) resultVo.getData();
-                JSONArray members = obj.getJSONArray("members");
-                for (int i = 0; i < members.size(); i++) {
-                    JSONObject member = members.getJSONObject(i);
-                    if (member.getString("name").trim().equals(param.getName().trim())) {
-                        String memberSysNo = member.getString("memberNo");
-                        param.setXnhMembersysno(memberSysNo);
-                        dao.updateMemberSysNo(param.getInpatientNo(), memberSysNo);
-                    }
+                Map<String, Object> obj = FilterUtil.cast(resultVo.getData());
+                Map<String, String> members = FilterUtil.cast(obj.get("members"));
+                if (members.get("name").trim().equals(param.getName().trim())) {
+                    String memberSysNo = members.get("memberNo");
+                    param.setXnhMembersysno(memberSysNo);
+                    dao.updateMemberSysNo(param.getInpatientNo(), memberSysNo);
                 }
                 resultVo = httpPost("register", param, "04");
                 if (resultVo.getCode() == ExceptionEnum.SUCCESS.getCode()) {
@@ -54,6 +51,7 @@ public class YbVerifyService {
                     } else {
                         resultVo = httpPost("uploadIdCard", param, "04");
                     }
+                    log.info("上传证件到新农合结果：{}", resultVo);
                     if (resultVo.getCode() == ExceptionEnum.SUCCESS.getCode()) {
                         dao.approveYbsf(param.getInpatientNo(), param.getAdmissTimes(), TokenUtil.getTokenUserId(), param.getYbRemark());
                         dao.updateZyActpatient(param.getInpatientNo(), param.getAdmissTimes());