Ver código fonte

13岁以下儿童建卡时需填写监护人信息。

lighter 4 anos atrás
pai
commit
e1cc657818

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>wxservice-server</artifactId>
-    <version>4.6</version>
+    <version>4.7</version>
     <name>wxservice-server</name>
     <description>server for wxservice-web</description>
 

+ 2 - 2
src/main/java/thyyxxk/wxservice_server/dao/PatientCardsDao.java

@@ -32,9 +32,9 @@ public interface PatientCardsDao {
     Integer validBindCount(@Param("openId") String openId);
 
     @Insert("insert into t_wechat_patient_bind (name, patient_id, social_no, phone, province, " +
-            "city, district, street, open_id, del_flag, is_default, ic_card_no) " +
+            "city, district, street, open_id, del_flag, is_default, ic_card_no, guard_name,guard_id_no) " +
             "values (#{name}, #{patientId}, #{socialNo}, #{phone}, #{province}, #{city}, " +
-            "#{district}, #{street}, #{openId}, 0, #{isDefault}, #{icCardNo})")
+            "#{district}, #{street}, #{openId}, 0, #{isDefault}, #{icCardNo}, #{guardName}, #{guardIdNo})")
     void bindPatientCard(BindPatientIdParam param);
 
     @Select("update t_wechat_patient_bind set is_default=#{isDefault} where " +

+ 3 - 0
src/main/java/thyyxxk/wxservice_server/pojo/analyzeidcard/IdCardAnalyzeResult.java

@@ -16,4 +16,7 @@ public class IdCardAnalyzeResult {
     private String city;
     private String district;
     private String street;
+    private String guardName;
+    private final Integer guardIdType = 1;
+    private String guardIdNo;
 }

+ 3 - 0
src/main/java/thyyxxk/wxservice_server/pojo/patientcards/BindPatientIdParam.java

@@ -15,6 +15,9 @@ public class BindPatientIdParam {
     private String city;
     private String district;
     private String street;
+    private String guardName;
+    private final Integer guardIdType = 1;
+    private String guardIdNo;
 
     private Integer isDefault;
 

+ 5 - 0
src/main/java/thyyxxk/wxservice_server/service/IdCardAnalyzeService.java

@@ -93,6 +93,9 @@ public class IdCardAnalyzeService {
         card.setPatSex(calculateSex(param.getSocialNo()));
         card.setPatBirth(formatBirthday(param.getSocialNo().substring(6, 14)));
         card.setPatType(calculatePatType(card.getPatAge()));
+        card.setGuardName(param.getGuardName());
+        card.setGuardIdType(1);
+        card.setGuardIdNo(param.getGuardIdNo());
         String provinceName = dao.selectRegionName(param.getProvince());
         String cityName = dao.selectRegionName(param.getCity());
         String districtName = dao.selectRegionName(param.getDistrict());
@@ -125,6 +128,8 @@ public class IdCardAnalyzeService {
         toBeBound.setStreet(param.getStreet());
         toBeBound.setOpenId(param.getOpenId());
         toBeBound.setIcCardNo(toBeBound.getPatientId());
+        toBeBound.setGuardName(param.getGuardName());
+        toBeBound.setGuardIdNo(param.getGuardIdNo());
         cardsDao.bindPatientCard(toBeBound);
         return CompletableFuture.completedFuture(ResultVoUtil.success(hrgResponse.getData()));
     }

+ 1 - 1
src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 8083
   servlet:
     context-path: /wxserver
 spring: