Merge branch 'develop_znwz_zzcx_xlcs' into dev/xlcs20200224_init

config-server/src/main/resources/shared/znwz-service-dev.yml

@@ -104,12 +104,12 @@ io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate
   thread-number: 12
 
-#nali:
-#  apiUrl: http://116.62.170.131:8096/openapi-devtest/gateway
-#  appKey: ngari5e34e52511dc394f
-#  appSecret: 11dc394fc05518c1
-
 nali:
-  apiUrl: https://ssltest.ngarihealth.com/openapi-prerelease/gateway
-  appKey: ngari5e48d9ec11dc3978
-  appSecret: 11dc397869c2d24a
+  apiUrl: http://116.62.170.131:8096/openapi-devtest/gateway
+  appKey: ngari5e34e52511dc394f
+  appSecret: 11dc394fc05518c1
+
+#nali:
+#  apiUrl: https://ssltest.ngarihealth.com/openapi-prerelease/gateway
+#  appKey: ngari5e48d9ec11dc3978
+#  appSecret: 11dc397869c2d24a

zzcx-service/src/main/java/com/diagbot/vo/InquiryCodeVO.java

@@ -42,24 +42,20 @@ public class InquiryCodeVO {
     /**
      * 对接科室主键
      */
-    @NotBlank(message = "对接科室主键")
     private String deptCode;
 
     /**
      * 对接科室名称
      */
-    @NotBlank(message = "对接科室名称")
     private String deptName;
 
     /**
      * 对接医生主键
      */
-    @NotBlank(message = "对接医生主键")
     private String doctorCode;
 
     /**
      * 对接医生姓名
      */
-    @NotBlank(message = "对接医生姓名")
     private String doctorName;
 }

zzcx-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.List;
 
 /**