Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/common/SystemConfig.java

@@ -71,7 +71,7 @@ public class SystemConfig {
    public String getPublicKey() { return  getSystemProperties().getProperty("gateway_public_key"); }
    
    public String getImmPublicKey() { return  getSystemProperties().getProperty("ImmPublicTest.key"); }
    public String getImmPublicKey() { return  getSystemProperties().getProperty("imm_public_key"); }
    public String getJwHospital()
    {

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/guahao/GuahaoService.java

@@ -1289,7 +1289,6 @@ public class GuahaoService {
    
    /**
     * 获取免疫接种机构列表
     * @param condition
     * @return
     */
    public String GetOrgImmuneList()throws Exception  {
@@ -1404,7 +1403,7 @@ public class GuahaoService {
        params.put("BarCode", barCode);
        params.put("OrgCode", orgCode);
        params.put("SectionType", sectionType);
        params.put("strStart", strStart);
        params.put("StartTime", strStart);
        params.put("SSID", ssid);
        params.put("PatientName", patientName);
        params.put("PatientID", patientID);
@@ -1446,7 +1445,7 @@ public class GuahaoService {
        params.put("BarCode", barCode);
        params.put("OrgCode", orgCode);
        params.put("SectionType", sectionType);
        params.put("strStart", strStart);
        params.put("StartTime", strStart);
        params.put("SSID", ssid);
        params.put("PatientName", patientName);
        params.put("PatientID", patientID);