Home Verkennen Help
Registreren Inloggen
trick9191
/
wlyy2.0
geforked van Amoy2/wlyy2.0
Volgen 1
Ster 0
Vork 0
Bestanden
Bladeren bron

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

trick9191 7 jaren geleden
bovenliggende
9f437f37c9 08be515a92
commit
423849d851
5 gewijzigde bestanden met toevoegingen van 67 en 1 verwijderingen
Gecombineerde weergave Toon Diff Stats
  1. 7 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/express/SFExpressService.java
  2. 1 1
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildFamilyImmuneService.java
  3. 23 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/express/SFExpressController.java
  4. 4 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java
  5. 32 0
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/express/SFExpressApiController.java

+ 7 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/express/SFExpressService.java
Bestand weergeven 

@ -637,4 +637,11 @@ public class SFExpressService extends BaseService {
 
        return reslut;
 
        return reslut;
 
    }
 
    }
 
    
    public String getRoutInfosSearch(PrescriptionExpressage sfexpress_obj)throws Exception {
 
        String xml = SFUtils.getRoutInfos(sfexpress_obj,sf_code);
 
        String re = this.SFExpressPost(xml);
 
        
        return xml;
 
    }
 
}
 
}

+ 1 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildFamilyImmuneService.java
Bestand weergeven 

@ -84,7 +84,7 @@ public class ChildFamilyImmuneService extends BaseService {
 
				"b.photo as photo " +
 
				"b.photo as photo " +
 
				"from wlyy_child_family_immune a " +
 
				"from wlyy_child_family_immune a " +
 
				"join wlyy_child_info b on b.code = a.child_code and b.del = 0 " +
 
				"join wlyy_child_info b on b.code = a.child_code and b.del = 0 " +
 
				"where a.del = 0 and a.family_code = "+repUID;
 
				"where a.del = 0 and a.family_code = '"+repUID+"'";
 
		
		
		List<Map<String, Object>> rs = jdbcTemplate.queryForList(sql);
 
		List<Map<String, Object>> rs = jdbcTemplate.queryForList(sql);
 
		return rs;
 
		return rs;

+ 23 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/express/SFExpressController.java
Bestand weergeven 

@ -204,5 +204,28 @@ public class SFExpressController extends BaseController {
 
            return error(-1, "查询失败," + e.getMessage());
 
            return error(-1, "查询失败," + e.getMessage());
 
        }
 
        }
 
    }
 
    }
 
    
    @RequestMapping(value="/sfrouteserviceSearch",method = RequestMethod.POST)
 
    @ApiOperation("通过处方编码查询顺丰物流派送记录")
 
    @ObserverRequired
 
    public String SFRouteServiceSearch(
 
            @ApiParam(name="prescriptionCode", value="处方编号") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode){
 
        
        try {
 
            Prescription prescription = prescriptionService.findByCode(prescriptionCode);
 
//            List<PrescriptionExpressageLog> sfexpresslogList = prescriptionExpressageLogService.findByPrescriptionCode(prescriptionCode);
 
            PrescriptionExpressage sfexpress_obj = prescriptionExpressageService.findByPrescriptionCode(prescriptionCode);
 
            
            String result  = sfexpressService.getRoutInfosSearch(sfexpress_obj);
 
            
            return write(200, "查询成功","data",result);
 
        }catch (Exception e){
 
            //日志文件中记录异常信息
 
            error(e);
 
            //返回接口异常信息处理结果
 
            return error(-1, "查询失败,"+e.getMessage());
 
        }
 
        
    }
 
}
 
}

+ 4 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java
Bestand weergeven 

@ -493,6 +493,10 @@ public class FamilyMemberController extends WeixinBaseController {
 
    
    
            ChildInfo childInfo  = childInfoService.getByBarCode(barCode);
 
            ChildInfo childInfo  = childInfoService.getByBarCode(barCode);
 
            
            
            if(StringUtils.isBlank(idcard) || StringUtils.isBlank(ssc)){
 
                return error(-1, "新生儿身份证和社保卡号不能为空！");
 
            }
 
            
            if(!idcard.equals(childInfo.getIdcard()) && StringUtils.isNotBlank(childInfo.getIdcard())){
 
            if(!idcard.equals(childInfo.getIdcard()) && StringUtils.isNotBlank(childInfo.getIdcard())){
 
                return error(-1, "新生儿身份证信息不一致，无法绑定");
 
                return error(-1, "新生儿身份证信息不一致，无法绑定");
 
            }
 
            }

+ 32 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/express/SFExpressApiController.java
Bestand weergeven 

@ -1,7 +1,11 @@
 
package com.yihu.wlyy.web.third.gateway.controller.express;
 
package com.yihu.wlyy.web.third.gateway.controller.express;
 
import com.yihu.wlyy.aop.ObserverRequired;
 
import com.yihu.wlyy.aop.ObserverRequired;
 
import com.yihu.wlyy.entity.patient.prescription.Prescription;
 
import com.yihu.wlyy.entity.patient.prescription.PrescriptionExpressage;
 
import com.yihu.wlyy.service.app.express.SFExpressService;
 
import com.yihu.wlyy.service.app.express.SFExpressService;
 
import com.yihu.wlyy.service.app.prescription.PrescriptionExpressageService;
 
import com.yihu.wlyy.service.app.prescription.PrescriptionService;
 
import com.yihu.wlyy.web.BaseController;
 
import com.yihu.wlyy.web.BaseController;
 
import io.swagger.annotations.Api;
 
import io.swagger.annotations.Api;
 
import io.swagger.annotations.ApiOperation;
 
import io.swagger.annotations.ApiOperation;
 
@ -25,6 +29,12 @@ public class SFExpressApiController extends BaseController {
 
    @Autowired
 
    @Autowired
 
    private SFExpressService sfexpressService;
 
    private SFExpressService sfexpressService;
 
    
    @Autowired
 
    private PrescriptionExpressageService prescriptionExpressageService;
 
    
    @Autowired
 
    private PrescriptionService prescriptionService;
 
    private String successxml = "<Response service='RoutePushService'><Head>OK</Head></Response>";
 
    private String successxml = "<Response service='RoutePushService'><Head>OK</Head></Response>";
 
@ -46,4 +56,26 @@ public class SFExpressApiController extends BaseController {
 
            return "<Response service='RoutePushService'><Head>ERR</Head><ERROR code='-1'>系统发生数据错误或运行时异常</ERROR></Response>";
 
            return "<Response service='RoutePushService'><Head>ERR</Head><ERROR code='-1'>系统发生数据错误或运行时异常</ERROR></Response>";
 
        }
 
        }
 
    }
 
    }
 
    
    @RequestMapping(value="/sfrouteserviceSearch",method = RequestMethod.POST)
 
    @ApiOperation("通过处方编码查询顺丰物流派送记录")
 
    @ObserverRequired
 
    public String SFRouteServiceSearch(
 
            @ApiParam(name="prescriptionCode", value="处方编号") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode){
 
        
        try {
 
            Prescription prescription = prescriptionService.findByCode(prescriptionCode);
 
            PrescriptionExpressage sfexpress_obj = prescriptionExpressageService.findByPrescriptionCode(prescriptionCode);
 
            
            String result  = sfexpressService.getRoutInfosSearch(sfexpress_obj);
 
            
            return write(200, "查询成功","data",result);
 
        }catch (Exception e){
 
            //日志文件中记录异常信息
 
            error(e);
 
            //返回接口异常信息处理结果
 
            return error(-1, "查询失败,"+e.getMessage());
 
        }
 
        
    }
 
}
 
}