Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/controller/medicine/PhysicalExaminationController.java

@@ -109,7 +109,12 @@ public class PhysicalExaminationController extends BaseController {
                MedicineAnswerLog medicineAnswerLog = medicineAnswerLogService.findAnswer(patientCode, examCode, _pb_id,ct_id);
                String answer="";
                if(medicineAnswerLog!=null){
                    answer = medicineAnswerLog.getAnswer().replace("\"","\\\"");
                    answer = medicineAnswerLog.getAnswer();
                    if(answer!=null){
                        answer = answer.replace("\"","\\\"");
                    }else{
                        answer = "";
                    }
                }else{
                    medicineAnswerLog = new MedicineAnswerLog();
                    medicineAnswerLog.setPatientCode(patientCode);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -794,7 +794,7 @@ public class PrescriptionInfoService extends BaseService {
        Doctor d = doctorDao.findByCode(doctor);
        if (d != null && StringUtils.isNotBlank(d.getHospital())) {
            String h = d.getHospital().substring(0, 8);
            String sql = "SELECT h.`code`,h.`name` FROM dm_hospital h WHERE h.`code` LIKE '%" + h + "%' AND RIGHT(h.code,2)<>'00' ";
            String sql = "SELECT h.`code`,h.`name` FROM dm_hospital h WHERE h.`code` LIKE '%" + h + "%' ";
            List<Map<String, Object>> hs = jdbcTemplate.queryForList(sql);
            rs.put("hospitals", hs);
        } else {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -94,6 +94,7 @@ public class PrescriptionInfoController extends BaseController {
    @RequestMapping(value = "/reviewPrescription", method = RequestMethod.POST)
    @ApiOperation(value = "续方审核")
    @ObserverRequired
    public String reviewPrescription(@RequestParam(required = true) @ApiParam(value = "续方CODE", name = "code") String code,
                                     @RequestParam(required = false) @ApiParam(value = "不同意原因", name = "reason") String reason,
                                     @RequestParam(required = false) @ApiParam(value = "1同意,2不同意", name = "state") String state,
@@ -333,6 +334,7 @@ public class PrescriptionInfoController extends BaseController {
    @RequestMapping(value = "/distributionHealthDoctor", method = RequestMethod.POST)
    @ApiOperation(value = "配置建管师")
    @ObserverRequired
    public String distributionHealthDoctor
            (@RequestParam(required = true) @ApiParam(value = "续方Code字符串用','分割", name = "codes") String codes,
             @RequestParam(required = true) @ApiParam(value = "健康管理师Code", name = "healthDoctor") String