代码修改

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

@@ -200,12 +200,12 @@ public class PrescriptionController extends BaseController{
	public Result getRecipeMasterList(@ApiParam(name="cardNo",value="病人卡号",defaultValue = "")
							@RequestParam(value = "cardNo",required = true) String cardNo,
							@ApiParam(name="applyTimeFrom",value="开始时间",defaultValue = "")
							@RequestParam(value = "applyTimeFrom",required = true) String applyTimeFrom,
							@RequestParam(value = "applyTimeFrom",required = false) String applyTimeFrom,
							@ApiParam(name="applyTimeEnd",value="结束时间",defaultValue = "")
							@RequestParam(value = "applyTimeEnd",required = true) String applyTimeEnd){
							@RequestParam(value = "applyTimeEnd",required = false) String applyTimeEnd){
		try {
			String re = prescriptionService.getRecipeMasterList(cardNo,applyTimeFrom,applyTimeEnd);
			return Result.success("调阅单条处方接口！",re);
			return Result.success("获取历史处方列表！",re);
		} catch (Exception ex) {
			ex.printStackTrace();
			return Result.error(ex.getMessage());

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

@@ -709,6 +709,11 @@ public class PrescriptionService extends ZysoftBaseService{
        header.put("ORGCODE",hospital);
        header.put("LICENCE",licence);
        if(StringUtils.isEmpty(applyTimeFrom)){
            applyTimeEnd = DateUtil.getStringDateShort();
            applyTimeFrom = DateUtil.getNextDay(new Date(),-60);
        }
        Map<String,String> params = new HashMap<>();
        params.put("cardNo",cardNo);
        params.put("applyTimeFrom",applyTimeFrom);