Home Explore Help
Register Sign In
Amoy2
/
wlyy2.0
Watch 5
Star 1
Fork 18
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java
yeshijie 4 years ago
parent
a69a48b7cf
commit
b014d1e84a
1 changed files with 6 additions and 6 deletions
Split View Show Diff Stats
  1. 6 6
      svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

+ 6 - 6
svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java
View File 

@ -135,12 +135,12 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
 
        patientBrief.setName(patientDetail.getName());
 
        patientBrief.setSex(patientDetail.getSex());
 
        patientBrief.setIdcard(patientDetail.getIdcard());
 
        patientBrief.setProvinceCode(patientDetail.getProvinceCode());
 
        patientBrief.setProvinceName(patientDetail.getProvinceName());
 
        patientBrief.setCityCode(patientDetail.getCityCode());
 
        patientBrief.setCityName(patientDetail.getCityName());
 
        patientBrief.setTownCode(patientDetail.getTownCode());
 
        patientBrief.setTownName(patientDetail.getTownName());
 
//        patientBrief.setProvinceCode(patientDetail.getProvinceCode());
 
//        patientBrief.setProvinceName(patientDetail.getProvinceName());
 
//        patientBrief.setCityCode(patientDetail.getCityCode());
 
//        patientBrief.setCityName(patientDetail.getCityName());
 
//        patientBrief.setTownCode(patientDetail.getTownCode());
 
//        patientBrief.setTownName(patientDetail.getTownName());
 
        patientBrief.setLiveProvinceCode(patientDetail.getLiveProvinceCode());
 
        patientBrief.setLiveProvinceName(patientDetail.getLiveProvinceName());
 
        patientBrief.setLiveCityCode(patientDetail.getLiveCityCode());