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

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

@@ -464,7 +464,7 @@ public class PrescriptionInfoService extends BaseService {
            //设置处方疾病类型
            if(StringUtils.isNotBlank(diagnosis)){
                StringBuffer sql2 = new StringBuffer("UPDATE wlyy_prescription_diagnosis SET del = 0 WHERE prescription_code = '"+code+"'");
                StringBuffer sql2 = new StringBuffer("DELETE FROM wlyy_prescription_diagnosis WHERE prescription_code = '"+code+"'");
                jdbcTemplate.execute(sql2.toString());
                JSONArray array = new  JSONArray(diagnosis);

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

@@ -102,7 +102,7 @@ public class PrescriptionInfoController extends BaseController{
    @ObserverRequired
    public String updatePresInfo(@RequestParam(required = true)@ApiParam(value = "续方CODE", name = "code") String code,
                                 @RequestParam(required = true)@ApiParam(value = "续方药品JSON", name = "infos") String infos,
                                 @RequestParam(required = false)@ApiParam(value = "疾病JSON", name = "infos") String diagnosis,
                                 @RequestParam(required = false)@ApiParam(value = "疾病JSON", name = "diagnosis") String diagnosis,
                                 @RequestParam(required = false)@ApiParam(value = "调整原因", name = "reason") String reason ){
        try {
            return write(200, "操作成功！", "data",prescriptionInfoService.updatePresInfo(code,infos,diagnosis,reason));