Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorMessageDao.java

@@ -22,4 +22,8 @@ public interface BaseDoctorMessageDao extends PagingAndSortingRepository<BaseDoc
    List<BaseDoctorMessageDO> findByDoctorAndDel(String doctor,Pageable pageRequest);
    @Query("from BaseDoctorMessageDO d where  d.del ='1' and d.id=?1 ")
    BaseDoctorMessageDO findByIdAndDel(String id);
}

business/base-service/src/main/java/com/yihu/jw/hospital/doctor/dao/service/BaseDoctorBGService.java

@@ -87,13 +87,13 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
    public List<Map<String,Object>> selectByDoctor(String doctor, Integer contentType, String content, Integer page, Integer size){
        String sql = "select id as \"id\", doctor as \"doctor\",doctor_name as \"doctorName\",content_type as \"contentType\"," +
                "content as \"content\" , content_desc as \"contentDesc\",is_sort as \"isSort\",del as \"del\" " +
                " from base_doctor_message whre del=1 and doctor='"+doctor+"' ";
                " from base_doctor_message where del=1 and doctor='"+doctor+"' ";
        if (contentType!=null){
            sql +=" and content_type= "+contentType;
        }
        if (StringUtils.isNotBlank(content)){
            sql +=" and content like '%"+content+"%'v";
            sql +=" and content like '%"+content+"%' ";
        }
        sql +=" order by is_sort desc ";
@@ -114,7 +114,7 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
            List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
            Integer isSort=0;
            if (maps!=null&&maps.size()!=0){
                isSort = Integer.parseInt(maps.get(0).get("total").toString());
                isSort = Integer.parseInt(maps.get(0).get("total").toString())+1;
            }else {
                isSort=isSort+1;
            }
@@ -139,7 +139,7 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
        Integer isSort=0;
        if (maps!=null&&maps.size()!=0){
            isSort = Integer.parseInt(maps.get(0).get("total").toString());
            isSort = Integer.parseInt(maps.get(0).get("total").toString())+1;
        }else {
            isSort=isSort+1;
        }
@@ -160,4 +160,9 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
    }
    public BaseDoctorMessageDO selectById(String id){
        return doctorMessageDao.findByIdAndDel(id);
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -7543,7 +7543,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     * @throws Exception
     */
    public com.alibaba.fastjson.JSONObject outpatient(String patient) throws Exception {
    public net.sf.json.JSON outpatient(String patient) throws Exception {
        PatientMappingDO mappingDO = patientMappingDao.findByPatient(patient);
        String url = "";
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("HAI_TAI_OUTPATIENT_URL");
@@ -7567,8 +7567,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        XMLSerializer xmlSerializer = new XMLSerializer();
        net.sf.json.JSON json = xmlSerializer.read(returnValue);
        logger.info("返回json" + json);
        com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(json.toString());
        return object;
        return json;
    }
@@ -7578,7 +7577,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     * @throws Exception
     */
    public com.alibaba.fastjson.JSONObject outpmedicaldoc(String patient) throws Exception {
    public net.sf.json.JSON outpmedicaldoc(String patient) throws Exception {
        PatientMappingDO mappingDO = patientMappingDao.findByPatient(patient);
        String url = "";
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("HAI_TAI_OUTPATIENT_URL");
@@ -7602,12 +7601,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        XMLSerializer xmlSerializer = new XMLSerializer();
        net.sf.json.JSON json = xmlSerializer.read(returnValue);
        logger.info("返回json" + json);
        com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(json.toString());
        return object;
        return json;
    }
    public com.alibaba.fastjson.JSONObject getPatInfoDataXml(String opid,String recSn) throws Exception {
    public net.sf.json.JSON getPatInfoDataXml(String opid,String recSn) throws Exception {
        String url = "";
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("HAI_TAI_OUTPATIENT_URL");
@@ -7633,8 +7631,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        XMLSerializer xmlSerializer = new XMLSerializer();
        net.sf.json.JSON json = xmlSerializer.read(returnValue);
        logger.info("返回json" + json);
        com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(json.toString());
        return object;
        return json;
    }
    public String writeOutPatient(String registerSn, String chiefComplaint, String hpi, String elapsemhis, String bodycheck, String assistanTcheck, String doctorId, String doctorName) throws Exception {

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1210,6 +1210,7 @@ public class BaseHospitalRequestMapping {
        public static final String saveDoctorMessage  = "/saveDoctorMessage";
        public static final String setMessageHead="/setMessageHead";
        public static final String delDoctorMessage = "/delDoctorMessage";
        public static final String selectMessageById = "/selectMessageById";
    }
    /**

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/hospital/BaseDoctorBGController.java

@@ -119,6 +119,13 @@ public class BaseDoctorBGController extends EnvelopRestEndpoint {
        return success(baseDoctorBGService.setMessageHead(id));
    }
    @ApiOperation("获取医生快捷回复消息")
    @PostMapping(value= BaseHospitalRequestMapping.BaseBackground.selectMessageById)
    public Envelop selectMessageById(@ApiParam(name = "id", value = "id", required = true)
                                  @RequestParam(value = "id", required = true)String id) throws Exception{
        return success(baseDoctorBGService.selectById(id));
    }
    @ApiOperation("删除医生快捷回复")
    @PostMapping(value= BaseHospitalRequestMapping.BaseBackground.delDoctorMessage)