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

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrescriptionController.java

@@ -197,14 +197,14 @@ public class PrescriptionController extends BaseController{
	@RequestMapping(value = "getRecipeMasterList",method = RequestMethod.POST)
	@ApiOperation("获取历史处方列表")
	public Result getRecipeMasterList(@ApiParam(name="cardNo",value="病人卡号",defaultValue = "")
							@RequestParam(value = "cardNo",required = true) String cardNo,
	public Result getRecipeMasterList(@ApiParam(name="patientCode",value="居民code",defaultValue = "")
							@RequestParam(value = "patientCode",required = true) String patientCode,
							@ApiParam(name="applyTimeFrom",value="开始时间",defaultValue = "")
							@RequestParam(value = "applyTimeFrom",required = false) String applyTimeFrom,
							@ApiParam(name="applyTimeEnd",value="结束时间",defaultValue = "")
							@RequestParam(value = "applyTimeEnd",required = false) String applyTimeEnd){
		try {
			String re = prescriptionService.getRecipeMasterList(cardNo,applyTimeFrom,applyTimeEnd);
			String re = prescriptionService.getRecipeMasterList(patientCode,applyTimeFrom,applyTimeEnd);
			return Result.success("获取历史处方列表！",re);
		} catch (Exception ex) {
			ex.printStackTrace();

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -690,16 +690,16 @@ public class PrescriptionService extends ZysoftBaseService{
    /**
     * 获取历史处方列表
     * @param cardNo
     * @param patientCode
     * @param applyTimeFrom
     * @param applyTimeEnd
     * @return
     * @throws Exception
     */
    public String getRecipeMasterList(String cardNo,String applyTimeFrom,String applyTimeEnd)  throws Exception
    public String getRecipeMasterList(String patientCode,String applyTimeFrom,String applyTimeEnd)  throws Exception
    {
        Patient patient = patientDao.findBySsc(cardNo);
        SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
        Patient patient = patientDao.findByCode(patientCode);
        SignFamily signFamily = signFamilyDao.findByPatient(patientCode);
        String[] hospitalMapping = getHospitalMapping(signFamily.getHospital()); //获取机构映射
        String hospital = hospitalMapping[0];
@@ -715,7 +715,7 @@ public class PrescriptionService extends ZysoftBaseService{
        }
        Map<String,String> params = new HashMap<>();
        params.put("cardNo",cardNo);
        params.put("cardNo",patient.getSsc());
        params.put("applyTimeFrom",applyTimeFrom);
        params.put("applyTimeEnd",applyTimeEnd);