Merge branch 'master' into master-手术随访

陈昶聿

17 小时以前 e12b7983327f4881f91c8d081c52abbbf5bbc1e4

 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java

@@ -1469,7 +1469,7 @@
        patArchive.setPatientno(externalInHospPatientInfo.getJiuZhenKH());
        patArchive.setBirthdate(parse);
        patArchive.setPatidHis(externalInHospPatientInfo.getBingRenID());
        patArchive.setSourcefrom(1);
        patArchive.setSourcefrom(1L);
        patArchive.setPattype("2");
        patArchive.setName(externalInHospPatientInfo.getXingMing());
        if (StringUtils.isNotEmpty(externalInHospPatientInfo.getXingBieDM()))