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

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

@@ -146,7 +146,9 @@ public class HcyyEntranceService {
    public String getYYCheckUrl(){
        List<WlyyHospitalSysDictDO> list =  wlyyHospitalSysDictDao.findByDictName("YyCheckUrl");
        if(list == null || list.size() <= 0) {
            return "";
        }
        String url = list.get(0).getDictCode();
        return url;
    }
@@ -2605,18 +2607,196 @@ public class HcyyEntranceService {
    public  String initParams(WlyyOutpatientDO outpatientDO,WlyyPrescriptionDO prescriptionDO,List<WlyyPrescriptionInfoDO> infoDOList) throws Exception {
        if (outpatientDO==null){
            throw new Exception("门诊为空");
    public String initParams(String serviceCode,String hisId,String payType,String patient,String doctor,List<WlyyPrescriptionInfoDO> infos,List<WlyyPrescriptionDiagnosisDO> diagnosisDOS,String outpatientId) throws Exception {
        String xml ="";
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patient);
        if (patientMappingDO == null){
            return "患者信息映射表为空";
        }
        DoctorMappingDO doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
        if (doctorMappingDO == null){
            return "医生信息映射表为空";
        }
        WlyyOutpatientDO outpatientDO =outpatientDao.findById(outpatientId);
        if(outpatientDO==null){
            return "就诊记录为空！";
        }
        String eventTime = DateUtil.dateToStrLong(outpatientDO.getCreateTime());
        String recipeTime = DateUtil.dateToStrLong(new Date());
        List<BaseDoctorHospitalDO> baseDoctorHospitalDOList = baseDoctorHospitalDao.findByDoctorCode(doctor);
        BaseDoctorHospitalDO baseDoctorHospitalDO = baseDoctorHospitalDOList.get(0);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
        BasePatientDO patientDO = patientDao.findById(patient);
        Double recipeFeeTotal = 0.00;
        for (int i = 0; i < infos.size(); i++) {
            Double packRetprice = infos.get(i).getPackRetprice();
            Double feeTotal=Integer.parseInt(infos.get(i).getQuantity()) * packRetprice;
            recipeFeeTotal += feeTotal;
        }
        if (patientDO == null){
            return "患者信息表为空";
        }
        if (baseDoctorDO == null){
            return "医生基本信息表为空";
        }
        if (baseDoctorHospitalDOList == null || baseDoctorHospitalDOList.size()==0){
            return "医生执业信息表为空";
        }
        if (StringUtils.isEmpty(hisId)){
            hisId = UUID.randomUUID().toString();
        }
        String sex = "";
        if (patientDO.getSex()!=null){
            if (patientDO.getSex() == 1){
                sex = "男";
            }
            if (patientDO.getSex() == 2){
                sex = "女";
            }
        }
        String base = "<base>  \n" +
                "    <hospital_code><![CDATA[1001]]></hospital_code>  \n" +
                "    <event_no><![CDATA["+outpatientDO.getRegisterNo()+"]]></event_no>  \n" +
                "    <patient_id><![CDATA[002097137200]]></patient_id>  \n" +
        //基础标记
        String base =
                "<base>  \n" +
                "    <hospital_code><![CDATA["+outpatientDO.getHospital()+"]]></hospital_code>  \n" +
                "    <event_no><![CDATA["+outpatientDO.getAdmNo()+"]]></event_no>  \n" +
                "    <patient_id><![CDATA["+patientMappingDO.getMappingCode()+"]]></patient_id>  \n" +
                "    <source><![CDATA[门诊]]></source>  \n" +
                "</base>  \n";
        return null;
        //患者就诊
        String optPatient =
                "<opt_patient>  \n" +
                "           <sex><![CDATA["+sex+"]]></sex>  \n" +
                "           <name><![CDATA["+ patientDO.getName()+"]]></name> \n" +
                "           <id_type><![CDATA[身份证]]></id_type>\n" +
                "           <id_no><![CDATA["+ patientDO.getIdcard()+"]]></id_no>  \n" +
                "           <birthday><![CDATA["+ patientDO.getBirthday()+"]]></birthday>  \n" +
                "           <event_time><![CDATA["+eventTime+"]]></event_time>  \n" +
                "           <dept_id><![CDATA["+outpatientDO.getDept()+"]]></dept_id>  \n" +
                "           <dept_name><![CDATA["+outpatientDO.getDeptName()+"]]></dept_name>  \n" +
                "           <pay_type><![CDATA["+("1".equalsIgnoreCase(payType) ? "医保" : "自费")+"]]></pay_type>  \n" +
                "           <pregnancy><![CDATA[]]></pregnancy>  \n" +
                "           <time_of_preg><![CDATA[]]></time_of_preg>  \n" +
                "           <breast_feeding><![CDATA[]]></breast_feeding>  \n" +
                "           <height><![CDATA[]]></height>  \n" +
                "           <weight><![CDATA[]]></weight>  \n" +
                "           <address><![CDATA["+ patientDO.getAddress()+"]]></address>  \n" +
                "           <phone_no><![CDATA["+ patientDO.getMobile()+"]]></phone_no>  \n" +
                "           <patient_condition><![CDATA[普通病人]]></patient_condition>  \n" +
                "</opt_patient>";
        //处方单
        String prescriptionInfo =
                "       <opt_prescription_info>  \n" +
                "           <recipe_id><![CDATA["+hisId+"]]></recipe_id>  \n" +
                "           <recipe_no><![CDATA["+hisId+"]]></recipe_no>  \n" +
                "           <recipe_source><![CDATA[门诊]]></recipe_source>  \n" +
                "           <recipe_type><![CDATA[西药方]]></recipe_type>  \n" +
                "           <dept_id><![CDATA["+ baseDoctorHospitalDO.getDeptCode()+"]]></dept_id>  \n" +
                "           <dept_name><![CDATA["+ baseDoctorHospitalDO.getDeptName()+"]]></dept_name>  \n" +
                "           <recipe_doc_title><![CDATA["+baseDoctorDO.getJobTitleName()+"]]></recipe_doc_title>  \n" +
                "           <recipe_doc_id><![CDATA["+doctorMappingDO.getMappingCode()+"]]></recipe_doc_id>  \n" +
                "           <recipe_doc_name><![CDATA["+baseDoctorDO.getName()+"]]></recipe_doc_name>  \n" +
                "           <recipe_time><![CDATA["+recipeTime+"]]></recipe_time>  \n" +
                "           <recipe_fee_total><![CDATA["+recipeFeeTotal+"]]></recipe_fee_total>  \n" +
                "           <herb_unit_price><![CDATA[]]></herb_unit_price>  \n" +
                "           <herb_packet_count><![CDATA[]]></herb_packet_count>  \n" +
                "           <recipe_status><![CDATA[0]]></recipe_status>  \n" +
                "           <comments><![CDATA[]]></comments>  \n" +
                "           <urgent_flag><![CDATA[0]]></urgent_flag>  \n" +
                "       </opt_prescription_info>";
        //处方明细
        String prescriptionItems="";
        for (int i = 0; i < infos.size(); i++) {
            String prescriptionItem =
                    "        <opt_prescription_item>     \n" +
                    "           <recipe_item_id><![CDATA["+hisId+"]]></recipe_item_id>  \n" +
                    "           <recipe_id><![CDATA["+infos.get(i).getId()+"]]></recipe_id>  \n" +
                    "           <group_no><![CDATA["+infos.get(i).getGroupNo()+"]]></group_no>  \n" +
                    "           <drug_id><![CDATA["+infos.get(i).getDrugNo()+"]]></drug_id>  \n" +
                    "           <drug_name><![CDATA["+infos.get(i).getDrugName()+"]]></drug_name>  \n" +
                    "           <specification><![CDATA["+infos.get(i).getSpecification()+"]]></specification>  \n" +
                    "           <manufacturer_name><![CDATA["+infos.get(i).getDrugPlace()+"]]></manufacturer_name>  \n" +
                    "           <drug_dose><![CDATA["+infos.get(i).getDosage() + infos.get(i).getUnitName()+"]]></drug_dose>  \n" +
                    "           <drug_admin_route_name><![CDATA["+infos.get(i).getSupplyName()+"]]></drug_admin_route_name>  \n" +
                    "           <drug_using_freq><![CDATA["+infos.get(i).getUsageCode()+"]]></drug_using_freq>  \n" +
                    "           <despensing_num><![CDATA["+infos.get(i).getQuantity()+"]]></despensing_num>  \n" +
                    "           <pack_unit><![CDATA["+infos.get(i).getPackUnitName()+"]]></pack_unit>  \n" +
                    "           <count_unit><![CDATA["+infos.get(i).getPackQuantity()+"]]></count_unit>  \n" +
                    "           <unit_price><![CDATA["+infos.get(i).getPackRetprice()+"]]></unit_price>  \n" +
                    "           <fee_total><![CDATA["+Integer.parseInt(infos.get(i).getQuantity()) * infos.get(i).getPackRetprice()+"]]></fee_total>  \n" +
                    "           <duration><![CDATA["+infos.get(i).getUsageName()+"]]></duration>  \n" +
                    "           <preparation><![CDATA["+infos.get(i).getUnitName()+"]]></preparation>  \n" +
                    "           <approve_no><![CDATA["+infos.get(i).getPzwh()+"]]></approve_no>  \n" +
                    "           <medicare_type><![CDATA[]]></medicare_type>  \n" +
                    "           <ouvas_flag><![CDATA[]]></ouvas_flag>  \n" +
                    "           <skin_test_flag><![CDATA[]]></skin_test_flag>  \n" +
                    "           <duration><![CDATA[]]></duration>  \n" +
                    "           <special_prompt><![CDATA[]]></special_prompt>  \n" +
                    "       </opt_prescription_item>  ";
            prescriptionItems += prescriptionItem;
        }
        //医生反馈信息
        String feedback = "<feed_back>  \n" +
                "       <recipe_id><![CDATA["+hisId+"]]></recipe_id>  \n" +
                "       <message><![CDATA["+outpatientDO.getAdvice()+"]]></message>  \n" +
                "       <status><![CDATA[1]]></status>  \n" +
                "   </feed_back>  ";
        //诊断
        String prescriptionDiagnoses="";
        for (int i = 0; i < diagnosisDOS.size(); i++) {
            String diagDate = DateUtil.dateToStrLong(diagnosisDOS.get(i).getCreateTime());
            String prescriptionDiagnose =
                    "   <opt_diagnosis>  \n" +
                    "       <diag_id><![CDATA["+diagnosisDOS.get(i).getId()+"]]></diag_id>  \n" +
                    "       <diag_date><![CDATA["+diagDate+"]]></diag_date>  \n" +
                    "       <diag_name><![CDATA["+diagnosisDOS.get(i).getName()+"]]></diag_name>  \n" +
                    "       <diag_code><![CDATA["+diagnosisDOS.get(i).getCode()+"]]></diag_code>  \n" +
                    "       <diag_status><![CDATA[0]]></diag_status>  \n" +
                    "       <diag_doc_name><![CDATA["+baseDoctorDO.getName()+"]]></diag_doc_name>  \n" +
                    "       <diag_type><![CDATA[门诊诊断]]></diag_type>  \n" +
                    "       <diag_code_type><![CDATA[1]]></diag_code_type>  \n" +
                    "   </opt_diagnosis>  ";
            prescriptionDiagnoses += prescriptionDiagnose;
        }
        String cancelPrescription = "<opt_prescriptions>  \n" +
                "       <opt_prescription>  \n" +
                "           <opt_prescription_info>  \n" +
                "               <recipe_id><![CDATA["+hisId+"]]></recipe_id>  \n" +
                "               <recipe_no><![CDATA["+hisId+"]]></recipe_no>  \n" +
                "           </opt_prescription_info>  \n" +
                "       </opt_prescription>  \n" +
                "   </opt_prescriptions>  ";
        String doctors = "<doc_id><![CDATA["+doctorMappingDO.getMappingCode()+"]]></doc_id>  \n" +
                "   <doc_name><![CDATA["+baseDoctorDO.getName()+"]]></doc_name>";
        String diagnoses="<opt_diagnoses>\n" +
                prescriptionDiagnoses  +
                "\n </opt_diagnoses>"  ;
        String prescriptions =
                "<opt_prescriptions>\n" +
                    "<opt_prescription>\n" +
                        prescriptionInfo  +
                        prescriptionItems  +
                    "</opt_prescription>\n" +
                "</opt_prescriptions>";
        if (serviceCode.equals("GY_V4_FLEXIBLE") || serviceCode.equals("GY_SF_V4")){
            xml = "<root>" + base + optPatient + prescriptions + diagnoses + "</root>";
        }
        else if (serviceCode.equals("SF_V4_VALID_FLAG")){
            xml = "<root>" + base + cancelPrescription + "</root>";
        }
        else if (serviceCode.equals("CANCEL_GROUP_DRUG_V4")){
            xml = "<root>" + base + doctors + cancelPrescription + "</root>";
        }
        else if (serviceCode.equals("SF_V4_DOUBLE_SIGN")){
            xml = "<root>" + base + doctors + feedback + "</root>";
        }
        return xml;
    }
    /**
@@ -2647,6 +2827,96 @@ public class HcyyEntranceService {
        return response;
    }
    //处方保存前，进行合理用药审查
    public String checkPrescriptions(String outpatient, String hisId, String payType, String patient, String doctor,List<WlyyPrescriptionInfoDO> infos, List<WlyyPrescriptionDiagnosisDO> diagnosisDOS) throws Exception {
        if (null == infos || infos.size() == 0) {
            return "药品信息为空";
        }
        if (diagnosisDOS == null || diagnosisDOS.size() == 0){
            return "诊断信息为空";
        }
            String xml = "";
            xml = initParams("GY_V4_FLEXIBLE", hisId, payType, patient, doctor, infos, diagnosisDOS,outpatient);
            String response = checkPrescription("GY_V4_FLEXIBLE", xml, "合理用药审查");
        return response;
    }
    //处方在医生站系统成功保存后调用
    public String saveCheck(String outpatient, String hisId, String payType, String patient, String doctor,List<WlyyPrescriptionInfoDO> infos, List<WlyyPrescriptionDiagnosisDO> diagnosisDOS){
        if (infos == null || infos.size() == 0) {
            return "药品信息为空";
        }
        if (diagnosisDOS == null || diagnosisDOS.size() == 0){
            return "诊断信息为空";
        }
            String xml = null;
            try {
                xml = initParams("GY_SF_V4",hisId, payType, patient, doctor, infos, diagnosisDOS,outpatient);
            } catch (Exception e) {
                e.printStackTrace();
            }
            String response = checkPrescription("GY_SF_V4", xml, "处方成功保存后调用");
            return response;
    }
    //处方保存成功后，发送给审方系统进行人工审方
    public String validCheck(String outpatient,String hisId, String payType, String patient, String doctor,List<WlyyPrescriptionInfoDO> infos, List<WlyyPrescriptionDiagnosisDO> diagnosisDOS){
        if (infos == null || infos.size() == 0) {
            return "药品信息为空";
        }
        if (diagnosisDOS == null || diagnosisDOS.size() == 0){
            return "诊断信息为空";
        }
            String xml = null;
            try {
                xml = initParams("SF_V4_VALID_FLAG", hisId, payType, patient, doctor, infos, diagnosisDOS,outpatient);
            } catch (Exception e) {
                e.printStackTrace();
            }
            String response = checkPrescription("SF_V4_VALID_FLAG", xml, "人工审方");
            return response;
    }
    //删除已保存处方时调用
    public String deletePrescription(String outpatient,String hisId, String payType, String patient, String doctor,List<WlyyPrescriptionInfoDO> infos, List<WlyyPrescriptionDiagnosisDO> diagnosisDOS){
        if (infos == null || infos.size() == 0) {
            return "药品信息为空";
        }
        if (diagnosisDOS == null || diagnosisDOS.size() == 0){
            return "诊断信息为空";
        }
            String xml = null;
            try {
                xml = initParams("CANCEL_GROUP_DRUG_V4", hisId, payType, patient, doctor, infos, diagnosisDOS,outpatient);
            } catch (Exception e) {
                e.printStackTrace();
            }
            String response = checkPrescription("CANCEL_GROUP_DRUG_V4", xml, "删除已保存处方时调用");
            return response;
    }
    //医生在对药师打回的处方进行双签处理后，医生站将双签信息推送给审方系统
    public String doubleSign(String outpatient,String hisId, String payType, String patient, String doctor,List<WlyyPrescriptionInfoDO> infos, List<WlyyPrescriptionDiagnosisDO> diagnosisDOS){
        if (infos == null || infos.size() == 0) {
            return "药品信息为空";
        }
        if (diagnosisDOS == null || diagnosisDOS.size() == 0){
            return "诊断信息为空";
        }
            String xml = null;
            try {
                xml = initParams("SF_V4_DOUBLE_SIGN",  hisId, payType, patient, doctor, infos, diagnosisDOS,outpatient);
            } catch (Exception e) {
                e.printStackTrace();
            }
            String response = checkPrescription("SF_V4_DOUBLE_SIGN", xml, "处方双签");
            return response;
    }
    //===========================杭州逸曜合理用药======================================
    //===========================CA签名================================

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/visit/BaseVisitDao.java

@@ -13,9 +13,9 @@ import java.util.List;
 */
public interface BaseVisitDao  extends PagingAndSortingRepository<BaseVisitDO, String>, JpaSpecificationExecutor<BaseVisitDO> {
    @Query("select a from BaseVisitDO a where a.doctor = ?1 and a.visitPlanDate between ?2 and ?3 ")
    @Query("select a from BaseVisitDO a where a.doctor = ?1 and a.visitPlanDate between ?2 and ?3 order by a.visitPlanDate desc")
    List<BaseVisitDO> findByDoctor(String doctor, Date begin, Date end) throws Exception;
    @Query("select a from BaseVisitDO a where a.visitPlanDate between ?1 and ?2 ")
    @Query("select a from BaseVisitDO a where a.visitPlanDate between ?1 and ?2 order by a.visitPlanDate desc ")
    List<BaseVisitDO> findByDoctor2(Date begin, Date end) throws Exception;
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/sign/SignEndpoint.java

@@ -645,4 +645,26 @@ public class SignEndpoint extends EnvelopRestEndpoint {
            return failedListEnvelopException2(e);
        }
    }
    /**
     * 按团队查找签约居民
     */
    @GetMapping(value = "findSignPatientByTeamCode")
    @ApiOperation(value = "按团队查找签约居民")
    public PageEnvelop<List<Map<String,Object>>> findSignPatientLabelListByTeamCode (
            @ApiParam(name = "teamCode", value = "团队code", required = false)
            @RequestParam(value = "teamCode",required = false) String teamCode,
            @ApiParam(name = "name", value = "姓名或身份证", required = false)
            @RequestParam(value = "name",required = false) String name,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        try{
            return servicePackageService.findSignPatientByTeamCode(teamCode, name, page, size);
        }catch (Exception e){
            return failedPageEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/team/TeamEndpoint.java

@@ -216,4 +216,15 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            return failedListEnvelopException2(e);
        }
    }
    @RequestMapping(value = "/AllTeams", method = RequestMethod.GET)
    @ApiOperation(value = "查询机构下所有的团队(不翻译名称)")
    public ListEnvelop getAllTeams(){
        try{
            List<BaseTeamDO> teams =  teamService.findAllTeams();
            return ListEnvelop.getSuccess("查询成功",teams);
        }catch (Exception e){
            return failedListEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
import org.assertj.core.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -6,6 +6,7 @@ import com.yihu.jw.care.dao.apply.PatientBedApplyDao;
import com.yihu.jw.care.dao.label.WlyyPatientLabelDao;
import com.yihu.jw.care.dao.sign.*;
import com.yihu.jw.care.service.common.DictService;
import com.yihu.jw.care.service.device.DeviceService;
import com.yihu.jw.care.util.ConstantUtil;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -81,6 +82,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    private WlyyPatientLabelDao patientLabelDao;
    @Autowired
    private DictService dictService;
    @Autowired
    private DeviceService deviceService;
    public void addPatientSignList(){
@@ -794,4 +797,53 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
    /**
     * 按团队和标签查找签约居民
     * @param teamCode
     * @return
     */
    public PageEnvelop<List<Map<String,Object>>> findSignPatientByTeamCode(String teamCode, String name,int page, int size){
        String sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_child' or dict_name = 'jkzl_older' ";
        List<Map<String,Object>> listtmp =  jdbcTemplate.queryForList(sqltmp);
        String paitentFilter = "";
        if(listtmp.size()>0){
            String jkzlPatients = String.valueOf(listtmp.get(0).get("orgCodes"));
            jkzlPatients = jkzlPatients.replaceAll(",","','");
            paitentFilter = " and p.id not in ('"+jkzlPatients+"') ";
        }
        String sql = "SELECT DISTINCT p.id,p.name,p.photo,p.idcard,p.mobile,p.openid,p.sex,p.pad_imei padImei " ;
        sql +=",(select COUNT(*) from wlyy_patient_device a where a.`user` = p.id and a.del=0) deviceFlag ";
        String countSql = "SELECT count(DISTINCT p.id) ";
        String filters ="";
        filters = "from base_service_package_sign_record sr,base_service_package_record r,  " +
                "                base_patient p,wlyy_patient_label l " +
                "                WHERE sr.id = r.sign_id and sr.status=1 and sr.patient = p.id and p.id = l.patient and l.label_type = 1 " ;
        if (StringUtils.isNotBlank(teamCode)){
            filters+= " and r.team_code =  '"+teamCode+"' ";
        }
        if(org.apache.commons.lang.StringUtils.isNotBlank(name)){
            filters += " and (p.name like '%"+name+"%' or p.idcard like '%"+name+"%') ";
        }
        filters += paitentFilter;
        String orderBy = " ORDER BY sr.create_time DESC " +
                "LIMIT "+ (page - 1) * size + "," + size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filters+orderBy);
        for (Map<String,Object> map : list){
            String idcard = map.get("idcard").toString();
            map.put("age", IdCardUtil.getAgeForIdcard(idcard));
            map.put("deviceType",deviceService.getPatientDeviceCategoryCode(map.get("id").toString()));
            //签约医生标识
            List<Map<String,Object>> doctorList = getServerDoctorAll(map.get("id").toString(),"0","1");
            List<Map<String,Object>> helperList = getServerDoctorAll(map.get("id").toString(),"0","2");
            map.put("helper", helperList.size()>0?1:0);
            map.put("doctor", doctorList.size()>0?1:0);
        }
        Long count = jdbcTemplate.queryForObject(countSql+filters,Long.class);
        return PageEnvelop.getSuccessListWithPage("success",list,page,size,count);
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/team/BaseTeamService.java

@@ -219,4 +219,18 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
        List<BaseTeamDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseTeamDO.class));
        return list;
    }
    public List<BaseTeamDO> findAllTeams(){
        String sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' ";
        List<Map<String, Object>> listTmp = jdbcTemplate.queryForList(sqltmp);
        String filter = "";
        if (listTmp.size() > 0) {
            String orgCodes = String.valueOf(listTmp.get(0).get("orgCodes"));
            orgCodes = orgCodes.replaceAll(",", "','");
            filter = " and t.org_code not in ('" + orgCodes + "') ";
        }
        String sql = " SELECT t.* FROM base_team t WHERE t.del = '1' "+filter;
        List<BaseTeamDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseTeamDO.class));
        return list;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/visit/BaseVisitService.java

@@ -67,6 +67,7 @@ public class BaseVisitService {
            for (Map<String, Object> map : temp.values()) {
                re.add(map);
            }
            re.sort(Comparator.comparing(obj -> ((Map<String,Object>) obj).get("date").toString()).reversed());
        }
        return re;

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/event/ApplicationEvent.java

@@ -3,6 +3,7 @@ package com.yihu.jw.care.event;
import com.yihu.jw.care.job.BirthdayReminderJob;
import com.yihu.jw.care.job.QuartzHelper;
import com.yihu.jw.care.job.consult.FinishConsultJob;
import com.yihu.jw.care.job.data.SaveDataPushJob;
import com.yihu.jw.care.job.device.DeviceLostAssociationJob;
import com.yihu.jw.care.job.device.PatientSosContactsJob;
import com.yihu.jw.care.job.message.DoctorSendUnreadJob;
@@ -123,6 +124,15 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("OVERTIME_VISIT_JOB exist");
            }
            //归集数据定时推送 每天晚上十一点
            if (!quartzHelper.isExistJob("SAVE_DATA_PUSH_JOB")){
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("SAVE_DATA_PUSH_JOB");
                quartzHelper.addJob(SaveDataPushJob.class, trigger, "SAVE_DATA_PUSH_JOB", new HashMap<String, Object>());
                logger.info("SAVE_DATA_PUSH_JOB success");
            }else {
                logger.info("SAVE_DATA_PUSH_JOB success");
            }
        } catch (Exception e) {
            logger.info(" job start failed");
        }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/data/SaveDataPushJob.java

@@ -0,0 +1,136 @@
package com.yihu.jw.care.job.data;
import com.yihu.jw.care.util.DateUtil;
import com.yihu.jw.care.zhylyjkglxt.dao.*;
import com.yihu.jw.care.zhylyjkglxt.entity.*;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.Date;
import java.util.List;
public class SaveDataPushJob implements Job {
    private static Logger logger = LoggerFactory.getLogger(SaveDataPushJob.class);
    @Autowired
    JdbcTemplate jdbcTemplate;
    @Autowired
    ZhSecurityMonitoringOrderDao zhSecurityMonitoringOrderDao;
    @Autowired
    ZhEmergencyAssistanceDao zhEmergencyAssistanceDao;
    @Autowired
    ZhBaseDoorCoachOrderDao zhBaseDoorCoachOrderDao;
    @Autowired
    ZhBaseDoorCoachFeeDetailDao zhBaseDoorCoachFeeDetailDao;
    @Autowired
    ZhLifeCareOrderDao zhLifeCareOrderDao;
    @Autowired
    ZhLifeCareFeeDetailDao zhLifeCareFeeDetailDao;
    @Autowired
    ZhBasePatientDao zhBasePatientDao;
    @Autowired
    ZhServicePackageItemDao zhServicePackageItemDao;
    @Autowired
    ZhDeviceDetailDao zhDeviceDetailDao;
    @Autowired
    ZhDevicePatientDeviceDao zhDevicePatientDeviceDao;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        // id  日期  字段（保存的） 表名(从哪里取到的)
        String date = DateUtil.dateToStrShort(new Date());
        saveSecurityMonitoringOrder(date);
        saveEmergencyAssistanceOrder(date);
        saveDoorCoachOrder(date);
        saveDoorCoachFeeDetail(date);
        saveLifeCareOrder(date);
        saveLifeCareFeeDetail(date);
        savePatientInfo(date);
        saveServicePackageItem(date);
        savePatientDevice(date);
        saveWlyyDevice(date);
    }
    //安防监护工单
    public void saveSecurityMonitoringOrder(String date){
        String securityMonitoringOrderSql="SELECT id,number,patient,serve_desc,serve_town,serve_address,doctor_name,`status`,hospital,service_status from base_security_monitoring_order WHERE create_time > '"+date+"'";
        List<ZhSecurityMonitoringOrderDO> query = jdbcTemplate.query(securityMonitoringOrderSql, new BeanPropertyRowMapper<>(ZhSecurityMonitoringOrderDO.class));
        zhSecurityMonitoringOrderDao.save(query);
    }
    //紧急救助工单
    public void saveEmergencyAssistanceOrder(String date){
        String emergencyAssistanceOrderSql ="SELECT id,patient_name,patient_phone,patient_idcard,org_name,serve_address,doctor_name,doctor_address,complete_time,team_code,proxy_patient_name,proxy_patient_phone,type,order_source FROM base_emergency_assistance_order WHERE create_time > '"+date+"'";
        List<ZhEmergencyAssistanceDO> query = jdbcTemplate.query(emergencyAssistanceOrderSql, new BeanPropertyRowMapper<>(ZhEmergencyAssistanceDO.class));
        zhEmergencyAssistanceDao.save(query);
    }
    //上门辅导工单
    public void saveDoorCoachOrder(String date){
        String doorCoachOrderSql = "SELECT id,proxy_patient_name,proxy_patient_phone,patient_name,patient_relation,patient_expected_serve_time,serve_desc,serve_address,serve_town,is_trans_other_org,total_fee,doctor_name,doctor_type,doctor_sign_time,doctor_sign_location,patient_confirm_finish_time,exam_paper_imgs,`status`,expected_doctor_name,hospital,followup_date FROM base_door_coach_order WHERE create_time >= '"+date+"'";
        List<ZhBaseDoorCoachOrderDO> query = jdbcTemplate.query(doorCoachOrderSql, new BeanPropertyRowMapper<>(ZhBaseDoorCoachOrderDO.class));
        zhBaseDoorCoachOrderDao.save(query);
    }
    //上门辅导 服务工单价格
    public void  saveDoorCoachFeeDetail(String date){
        String doorCoachFeeDetailSql="SELECT id,order_id,type,`name`,fee,number,`status`,create_time,create_user_name,pay_status FROM base_door_coach_fee_detail WHERE create_time >= '"+date+"'";
        List<ZhBaseDoorCoachFeeDetailDO> query = jdbcTemplate.query(doorCoachFeeDetailSql, new BeanPropertyRowMapper<>(ZhBaseDoorCoachFeeDetailDO.class));
        zhBaseDoorCoachFeeDetailDao.save(query);
    }
    // 生活照料 工单
    public void  saveLifeCareOrder(String date){
        String lifeCareOrderSql = "SELECT id,proxy_patient_name,proxy_patient_phone,patient_name,patient_phone,patient_relation,serve_desc,serve_town,serve_address,total_fee,doctor_name,doctor_type,`status`,doctor_sign_location,sign_doctor_name,conclusion_remark,pay_status FROM base_life_care_order WHERE create_time >= '"+date+"'";
        List<ZhLifeCareOrderDO> query = jdbcTemplate.query(lifeCareOrderSql, new BeanPropertyRowMapper<>(ZhLifeCareOrderDO.class));
        zhLifeCareOrderDao.save(query);
    }
    //生活照料 价格
    public void saveLifeCareFeeDetail(String date){
        String lifeCareFeeDetail="SELECT id,order_id,type,`name`,fee,fee_discount,`status`,pay_status,create_time,update_time FROM base_life_care_fee_detail WHERE create_time >= '"+date+"'";
        List<ZhLifeCareFeeDetailDO> query = jdbcTemplate.query(lifeCareFeeDetail, new BeanPropertyRowMapper<>(ZhLifeCareFeeDetailDO.class));
        zhLifeCareFeeDetailDao.save(query);
    }
    //居民信息
    public void savePatientInfo(String date){
        String patientInfoSql="SELECT id,register,idcard,`name`,birthday,sex,mobile,province_name,city_name,town_name,street_name,committee_name,address,patient_status,marriage,national,blood,archive_status,archive_type,ssc,disease,home_address,sign_status,medical_state FROM base_patient WHERE create_time>= '"+date+"'";
        List<ZhBasePatientDO> query = jdbcTemplate.query(patientInfoSql, new BeanPropertyRowMapper<>(ZhBasePatientDO.class));
        zhBasePatientDao.save(query);
    }
    //服务项
    public void saveServicePackageItem(String date){
        String servicePackageItemSql= "SELECT id,`name`,price,fee_type,org_name,introduce,del from base_service_package_item WHERE create_time >= '"+date+"'";
        List<ZhServicePackageItemDO> query = jdbcTemplate.query(servicePackageItemSql, new BeanPropertyRowMapper<>(ZhServicePackageItemDO.class));
        zhServicePackageItemDao.save(query);
    }
    // 居民设备表
    public void savePatientDevice(String date){
        String patientDeviceSql = "SELECT id,device_id,`user`,category_code,device_name,user_idcard,doctor_name,hospital_name,device_type from wlyy_patient_device WHERE czrq >= '"+date+"'";
        List<ZhDevicePatientDevice> query = jdbcTemplate.query(patientDeviceSql, new BeanPropertyRowMapper<>(ZhDevicePatientDevice.class));
        zhDevicePatientDeviceDao.save(query);
    }
    //设备表
    public void saveWlyyDevice(String date){
        String deviceSql = "SELECT id,apply_date,org_name,linkman,tel,server_ip,device_name,manufacturer,applicant_name,applicant_identity,applicant_tel,applicant_mail,grant_org_code,grant_time,grant_doctor_name,device_type,contact_status_time,contact_status,iccid FROM wlyy_devices WHERE apply_date >= '"+date+"'";
        List<ZhDeviceDetail> query = jdbcTemplate.query(deviceSql, new BeanPropertyRowMapper<>(ZhDeviceDetail.class));
        zhDeviceDetailDao.save(query);
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/web/JobController.java

@@ -8,6 +8,7 @@ import com.yihu.jw.care.job.message.DoctorSendUnreadJob;
import com.yihu.jw.care.job.message.PatientSendUnreadJob;
import com.yihu.jw.care.service.BirthdayReminderService;
import com.yihu.jw.care.service.JobService;
import com.yihu.jw.care.util.DateUtil;
import com.yihu.jw.care.util.SystemConf;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import io.swagger.annotations.Api;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.HashMap;
import java.util.UUID;
@@ -313,4 +315,8 @@ public class JobController extends BaseController {
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseDoorCoachFeeDetailDao.java

@@ -1,7 +1,12 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachFeeDetailDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2022/1/20.
 */
public interface ZhBaseDoorCoachFeeDetailDao {
public interface ZhBaseDoorCoachFeeDetailDao extends PagingAndSortingRepository<ZhBaseDoorCoachFeeDetailDO, String>, JpaSpecificationExecutor<ZhBaseDoorCoachFeeDetailDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseDoorCoachOrderDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseDoorCoachOrderDao extends PagingAndSortingRepository<ZhBaseDoorCoachOrderDO, String>, JpaSpecificationExecutor<ZhBaseDoorCoachOrderDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBasePatientDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDoorCoachFeeDetailDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBasePatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBasePatientDao extends PagingAndSortingRepository<ZhBasePatientDO, String>, JpaSpecificationExecutor<ZhBasePatientDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhDeviceDetailDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDeviceDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhDeviceDetailDao extends PagingAndSortingRepository<ZhDeviceDetail, String>, JpaSpecificationExecutor<ZhDeviceDetail> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhDevicePatientDeviceDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDevicePatientDevice;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhDevicePatientDeviceDao extends PagingAndSortingRepository<ZhDevicePatientDevice, String>, JpaSpecificationExecutor<ZhDevicePatientDevice> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhEmergencyAssistanceDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhEmergencyAssistanceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhEmergencyAssistanceDao extends PagingAndSortingRepository<ZhEmergencyAssistanceDO, String>, JpaSpecificationExecutor<ZhEmergencyAssistanceDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhLifeCareFeeDetailDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhLifeCareFeeDetailDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhLifeCareFeeDetailDao extends PagingAndSortingRepository<ZhLifeCareFeeDetailDO, String>, JpaSpecificationExecutor<ZhLifeCareFeeDetailDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhLifeCareOrderDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhLifeCareOrderDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhSecurityMonitoringOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhLifeCareOrderDao extends PagingAndSortingRepository<ZhLifeCareOrderDO, String>, JpaSpecificationExecutor<ZhLifeCareOrderDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhSecurityMonitoringOrderDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhSecurityMonitoringOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhSecurityMonitoringOrderDao extends PagingAndSortingRepository<ZhSecurityMonitoringOrderDO, String>, JpaSpecificationExecutor<ZhSecurityMonitoringOrderDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhServicePackageItemDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhServicePackageItemDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhServicePackageItemDao extends PagingAndSortingRepository<ZhServicePackageItemDO, String>, JpaSpecificationExecutor<ZhServicePackageItemDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseDoorCoachOrderDO.java

@@ -1120,6 +1120,7 @@ public class ZhBaseDoorCoachOrderDO extends UuidIdentityEntityWithOperator {
        this.followupList = followupList;
    }
    @Column(name = "conclusion_status")
    public Integer getConclusionStatus() {
        return conclusionStatus;
    }
@@ -1128,6 +1129,7 @@ public class ZhBaseDoorCoachOrderDO extends UuidIdentityEntityWithOperator {
        this.conclusionStatus = conclusionStatus;
    }
    @Column(name = "prescription_status")
    public Integer getPrescriptionStatus() {
        return prescriptionStatus;
    }
@@ -1136,6 +1138,7 @@ public class ZhBaseDoorCoachOrderDO extends UuidIdentityEntityWithOperator {
        this.prescriptionStatus = prescriptionStatus;
    }
    @Column(name = "prescription_code")
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
@@ -1144,6 +1147,7 @@ public class ZhBaseDoorCoachOrderDO extends UuidIdentityEntityWithOperator {
        this.prescriptionCode = prescriptionCode;
    }
    @Column(name = "prescription_time")
    public Date getPrescriptionTime() {
        return prescriptionTime;
    }
@@ -1160,6 +1164,7 @@ public class ZhBaseDoorCoachOrderDO extends UuidIdentityEntityWithOperator {
        this.type = type;
    }
    @Column(name = "authorize_image")
    public String getAuthorizeImage() {
        return authorizeImage;
    }
@@ -1222,6 +1227,7 @@ public class ZhBaseDoorCoachOrderDO extends UuidIdentityEntityWithOperator {
        this.followupDate = followupDate;
    }
    @Column(name = "pay_status")
    public Integer getPayStatus() {
        return payStatus;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBasePatientDO.java

@@ -304,6 +304,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.medicalState = medicalState;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
@@ -312,6 +313,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.cardType = cardType;
    }
    @Column(name = "openid_time")
    public Date getOpenidTime() {
        return openidTime;
    }
@@ -596,15 +598,16 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.del = del;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    @Column(name = "remark")
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "live_province_code")
    public String getLiveProvinceCode() {
        return liveProvinceCode;
    }
@@ -613,6 +616,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveProvinceCode = liveProvinceCode;
    }
    @Column(name = "live_province_name")
    public String getLiveProvinceName() {
        return liveProvinceName;
    }
@@ -621,6 +625,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveProvinceName = liveProvinceName;
    }
    @Column(name = "live_city_code")
    public String getLiveCityCode() {
        return liveCityCode;
    }
@@ -629,6 +634,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveCityCode = liveCityCode;
    }
    @Column(name = "live_city_name")
    public String getLiveCityName() {
        return liveCityName;
    }
@@ -637,6 +643,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveCityName = liveCityName;
    }
    @Column(name = "live_town_code")
    public String getLiveTownCode() {
        return liveTownCode;
    }
@@ -645,6 +652,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveTownCode = liveTownCode;
    }
    @Column(name = "live_town_name")
    public String getLiveTownName() {
        return liveTownName;
    }
@@ -687,6 +695,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.enabled = enabled;
    }
    @Column(name = "login_failure_count")
    public Integer getLoginFailureCount() {
        return loginFailureCount;
    }
@@ -695,6 +704,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.loginFailureCount = loginFailureCount;
    }
    @Column(name = "locked_date")
    public Date getLockedDate() {
        return lockedDate;
    }
@@ -703,6 +713,7 @@ public class ZhBasePatientDO extends UuidIdentityEntityWithOperator {
        this.lockedDate = lockedDate;
    }
    @Column(name = "login_date")
    public Date getLoginDate() {
        return loginDate;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhDeviceDetail.java

@@ -167,7 +167,7 @@ public class ZhDeviceDetail extends IdEntity {
        this.serverIp = serverIp;
    }
    @Column(name = "manufacturerCode")
    @Column(name = "manufacturer_code")
    public String getManufacturerCode() {
        return manufacturerCode;
    }
@@ -368,6 +368,7 @@ public class ZhDeviceDetail extends IdEntity {
        this.imsi = imsi;
    }
    @Column(name = "category_code")
    public String getCategoryCode() {
        return categoryCode;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhDevicePatientDevice.java

@@ -298,7 +298,8 @@ public class ZhDevicePatientDevice extends IdEntity {
    public ZhDevicePatientDevice() {
    }
    
    @Column(name = "apply_status")
    public Integer getApplyStatus() {
        return applyStatus;
    }
@@ -306,7 +307,8 @@ public class ZhDevicePatientDevice extends IdEntity {
    public void setApplyStatus(Integer applyStatus) {
        this.applyStatus = applyStatus;
    }
    
    @Column(name = "apply_reason")
    public String getApplyReason() {
        return applyReason;
    }
@@ -315,6 +317,7 @@ public class ZhDevicePatientDevice extends IdEntity {
        this.applyReason = applyReason;
    }
    @Column(name = "refuse_reason")
    public String getRefuseReason() {
        return refuseReason;
    }
@@ -332,6 +335,7 @@ public class ZhDevicePatientDevice extends IdEntity {
        this.deviceImgUrl = deviceImgUrl;
    }
    @Column(name = "device_type")
    public Integer getDeviceType() {
        return deviceType;
    }
@@ -340,6 +344,7 @@ public class ZhDevicePatientDevice extends IdEntity {
        this.deviceType = deviceType;
    }
    @Column(name = "iot_device_sn")
    public String getIotDeviceSn() {
        return iotDeviceSn;
    }
@@ -348,6 +353,7 @@ public class ZhDevicePatientDevice extends IdEntity {
        this.iotDeviceSn = iotDeviceSn;
    }
    @Column(name = "safe_area_gz")
    public String getSafeAreaGz() {
        return safeAreaGz;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhEmergencyAssistanceDO.java

@@ -1,8 +1,10 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.care.securitymonitoring.EmergencyWarnConclusionDO;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -91,6 +93,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.patient = patient;
    }
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
@@ -99,6 +102,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.patientName = patientName;
    }
    @Column(name = "patient_phone")
    public String getPatientPhone() {
        return patientPhone;
    }
@@ -107,6 +111,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.patientPhone = patientPhone;
    }
    @Column(name = "patient_idcard")
    public String getPatientIdcard() {
        return patientIdcard;
    }
@@ -115,6 +120,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.patientIdcard = patientIdcard;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
@@ -123,6 +129,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
@@ -131,6 +138,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.orgName = orgName;
    }
    @Column(name = "serve_lat")
    public String getServeLat() {
        return serveLat;
    }
@@ -139,6 +147,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.serveLat = serveLat;
    }
    @Column(name = "serve_lon")
    public String getServeLon() {
        return serveLon;
    }
@@ -147,6 +156,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.serveLon = serveLon;
    }
    @Column(name = "session_id")
    public String getSessionId() {
        return sessionId;
    }
@@ -163,6 +173,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
@@ -171,6 +182,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.doctorName = doctorName;
    }
    @Column(name = "doctor_lat")
    public String getDoctorLat() {
        return doctorLat;
    }
@@ -179,6 +191,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.doctorLat = doctorLat;
    }
    @Column(name = "doctor_lon")
    public String getDoctorLon() {
        return doctorLon;
    }
@@ -195,6 +208,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.conclusion = conclusion;
    }
    @Column(name = "conclusion_img")
    public String getConclusionImg() {
        return conclusionImg;
    }
@@ -211,6 +225,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.status = status;
    }
    @Column(name = "serve_address")
    public String getServeAddress() {
        return serveAddress;
    }
@@ -218,6 +233,8 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
    public void setServeAddress(String serveAddress) {
        this.serveAddress = serveAddress;
    }
    @Column(name = "doctor_address")
    public String getDoctorAddress() {
        return doctorAddress;
    }
@@ -226,6 +243,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.doctorAddress = doctorAddress;
    }
    @Column(name = "complete_time")
    public Date getCompleteTime() {
        return completeTime;
    }
@@ -234,6 +252,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.completeTime = completeTime;
    }
    @Column(name = "team_code")
    public String getTeamCode() {
        return teamCode;
    }
@@ -242,6 +261,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.teamCode = teamCode;
    }
    @Column(name = "proxy_patient")
    public String getProxyPatient() {
        return proxyPatient;
    }
@@ -250,6 +270,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.proxyPatient = proxyPatient;
    }
    @Column(name = "proxy_patient_name")
    public String getProxyPatientName() {
        return proxyPatientName;
    }
@@ -258,6 +279,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.proxyPatientName = proxyPatientName;
    }
    @Column(name = "proxy_patient_phone")
    public String getProxyPatientPhone() {
        return proxyPatientPhone;
    }
@@ -328,6 +350,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.otherDoctorDistance = otherDoctorDistance;
    }
    @Column(name = "order_source")
    public Integer getOrderSource() {
        return orderSource;
    }
@@ -345,6 +368,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.emergencyWarnConclusionDO = emergencyWarnConclusionDO;
    }
    @Column(name = "emergency_cancel")
    public Integer getEmergencyCancel() {
        return emergencyCancel;
    }
@@ -353,6 +377,7 @@ public class ZhEmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
        this.emergencyCancel = emergencyCancel;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhLifeCareOrderDO.java

@@ -668,6 +668,7 @@ public class ZhLifeCareOrderDO extends UuidIdentityEntityWithOperator {
        this.conclusionTime = conclusionTime;
    }
    @Column(name = "pay_status")
    public Integer getPayStatus() {
        return payStatus;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhSecurityMonitoringOrderDO.java

@@ -567,6 +567,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.type = type;
    }
    @Column(name = "authorize_image")
    public String getAuthorizeImage() {
        return authorizeImage;
    }
@@ -602,6 +603,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.orderInfo = orderInfo;
    }
    @Column(name = "conclusion_status")
    public Integer getConclusionStatus() {
        return conclusionStatus;
    }
@@ -610,6 +612,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.conclusionStatus = conclusionStatus;
    }
    @Column(name = "doctor_confirm_finish_img")
    public String getDoctorConfirmFinishImg() {
        return doctorConfirmFinishImg;
    }
@@ -618,6 +621,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.doctorConfirmFinishImg = doctorConfirmFinishImg;
    }
    @Column(name = "doctor_confirm_finish_time")
    public Date getDoctorConfirmFinishTime() {
        return doctorConfirmFinishTime;
    }
@@ -626,6 +630,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.doctorConfirmFinishTime = doctorConfirmFinishTime;
    }
    @Column(name = "order_source")
    public Integer getOrderSource() {
        return orderSource;
    }
@@ -634,6 +639,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.orderSource = orderSource;
    }
    @Column(name = "emergency_cancel")
    public Integer getEmergencyCancel() {
        return emergencyCancel;
    }
@@ -642,6 +648,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.emergencyCancel = emergencyCancel;
    }
    @Column(name = "topic_item")
    public String getTopicItem() {
        return topicItem;
    }
@@ -650,6 +657,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.topicItem = topicItem;
    }
    @Column(name = "scene_img")
    public String getSceneImg() {
        return sceneImg;
    }
@@ -658,6 +666,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.sceneImg = sceneImg;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -666,6 +675,7 @@ public class ZhSecurityMonitoringOrderDO extends UuidIdentityEntityWithOperator
        this.deviceSn = deviceSn;
    }
    @Column(name = "warn_info")
    public String getWarnInfo() {
        return warnInfo;
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/sql记录.sql

@@ -0,0 +1,454 @@
-- 上门服务工单
CREATE TABLE `base_door_coach_order` (
                                         `id` varchar(50) NOT NULL DEFAULT '',
                                         `number` varchar(50) DEFAULT NULL COMMENT '服务编号',
                                         `proxy_patient` varchar(50) DEFAULT NULL COMMENT '代理发起工单的居民code，替父母，孩子等发起工单',
                                         `proxy_patient_name` varchar(10) DEFAULT NULL COMMENT '代理发起工单的居民code，替父母，孩子等发起工单',
                                         `proxy_patient_phone` varchar(15) DEFAULT NULL COMMENT '代理发起工单的居民联系电话',
                                         `patient` varchar(50) DEFAULT NULL COMMENT '被服务的居民code，发起工单的居民的亲属',
                                         `patient_name` varchar(10) DEFAULT NULL COMMENT '被服务的居民姓名，发起工单的居民的亲属',
                                         `patient_phone` varchar(15) DEFAULT NULL COMMENT '被服务的居民联系电话',
                                         `patient_relation` varchar(10) DEFAULT NULL COMMENT '发起人与被服务人的关系：自己，父亲，母亲，儿子等',
                                         `dispatcher` varchar(50) DEFAULT NULL COMMENT '调度员code',
                                         `dispatcher_name` varchar(50) DEFAULT NULL COMMENT '调度员name',
                                         `patient_expected_serve_time` varchar(200) DEFAULT NULL COMMENT '居民期望服务时间',
                                         `serve_desc` varchar(200) DEFAULT NULL COMMENT '居民自己服务描述',
                                         `serve_town` varchar(100) DEFAULT NULL COMMENT '上门服务的区',
                                         `serve_address` varchar(100) DEFAULT NULL COMMENT '上门服务详细地址',
                                         `serve_lat` varchar(100) DEFAULT NULL COMMENT '上门服务地址纬度',
                                         `serve_lon` varchar(100) DEFAULT NULL COMMENT '上门服务地址经度',
                                         `remark` varchar(200) DEFAULT NULL COMMENT '调度员备注',
                                         `is_patient_confirm` int(1) DEFAULT NULL COMMENT '居民对工单需要服务情况是否已确认，0-未确认，1-已确认 2-不同意',
                                         `patient_confirm_time` timestamp NULL DEFAULT NULL COMMENT '居民对工单需要服务情况确认时间',
                                         `is_trans_other_org` int(1) DEFAULT NULL COMMENT '工单是否转给其他机构，0-不转，1-已转',
                                         `transed_org_code` varchar(50) DEFAULT NULL COMMENT '最后转接的机构code',
                                         `transed_dispatcher` varchar(50) DEFAULT NULL COMMENT '最后转接的机构调度员code',
                                         `transed_dispatcher_name` varchar(50) DEFAULT NULL COMMENT '最后转接的机构调度员name',
                                         `total_fee` decimal(10,2) DEFAULT NULL COMMENT '服务总的支付费用',
                                         `doctor` varchar(50) DEFAULT NULL COMMENT '接单的医生code',
                                         `doctor_name` varchar(50) DEFAULT NULL COMMENT '接单的医生name',
                                         `doctor_type` varchar(50) DEFAULT NULL COMMENT '接单的医生类型：医生，健管师，护士等',
                                         `doctor_arriving_time` varchar(200) DEFAULT NULL COMMENT '医生预计到达时间',
                                         `doctor_sign_time` timestamp NULL DEFAULT NULL COMMENT '医生签到时间',
                                         `doctor_sign_way` int(1) DEFAULT NULL COMMENT '医生签到方式：1-定位，2-扫码，3-拍照',
                                         `doctor_sign_location` varchar(50) DEFAULT NULL COMMENT '医生签到位置，记录详细地址',
                                         `doctor_sign_img` varchar(3000) DEFAULT NULL COMMENT '医生签到照片',
                                         `patient_confirm_finish_way` int(1) DEFAULT NULL COMMENT '居民确认结束服务方式：1-电子签名，2-手持身份证拍照',
                                         `patient_confirm_finish_img` varchar(200) DEFAULT NULL COMMENT '居民确认结束服务照片',
                                         `patient_confirm_finish_time` timestamp NULL DEFAULT NULL COMMENT '居民确认医生结束服务时间',
                                         `present_imgs` varchar(3000) DEFAULT NULL COMMENT '医生诊疗现场照片，最多9张，逗号分隔',
                                         `exam_paper_status` int(1) DEFAULT NULL COMMENT '是否需要上传补录报告：0-不需要，1-需要，待补录；2-需要，已补录',
                                         `exam_paper_imgs` varchar(3000) DEFAULT NULL COMMENT '医生上传居民的化验检查报告照片',
                                         `exam_paper_upload_time` timestamp NULL DEFAULT NULL COMMENT '化验检查报告补录时间',
                                         `exam_paper_upload_way` int(1) DEFAULT NULL COMMENT '化验检查报告补录方式，1-拍照补录，2-接口数据',
                                         `status` int(1) DEFAULT NULL COMMENT '工单状态：-1-已取消，1-待（调度员）派单，2-待（医生）接单，3-已接单，4-签到，5-登记服务小结，6-已完成',
                                         `complete_time` timestamp NULL DEFAULT NULL COMMENT '工单完成时间（对工单评价完即工单完成）',
                                         `cancel_type` int(1) DEFAULT NULL COMMENT '取消类型：1-调度员取消，2-居民取消,3-医生取消',
                                         `cancel_reason` varchar(200) DEFAULT NULL COMMENT '取消理由',
                                         `cancel_time` timestamp NULL DEFAULT NULL COMMENT '取消时间',
                                         `pay_way` int(1) DEFAULT NULL COMMENT '付款方式：1-微信支付，2-线下支付（居民自己向医院支付，具体怎么支付由医院来定）',
                                         `pay_number` varchar(100) DEFAULT NULL COMMENT '支付流水号',
                                         `pay_time` timestamp NULL DEFAULT NULL COMMENT '支付时间',
                                         `dispatcher_response_time` timestamp NULL DEFAULT NULL COMMENT '调度员响应时间（派单时间或取消时间）',
                                         `service_response_time` timestamp NULL DEFAULT NULL COMMENT '服务医生响应时间（第一条咨询或者接单时间）',
                                         `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
                                         `create_user` varchar(50) DEFAULT NULL COMMENT '创建者id',
                                         `create_user_name` varchar(50) DEFAULT NULL COMMENT '创建者名称',
                                         `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                         `update_user` varchar(50) DEFAULT NULL,
                                         `update_user_name` varchar(50) DEFAULT NULL,
                                         `expected_doctor_name` varchar(10) DEFAULT '' COMMENT '居民期望服务的医生姓名',
                                         `hospital` varchar(50) DEFAULT NULL COMMENT '服务机构',
                                         `conclusion_status` int(1) DEFAULT NULL COMMENT '服务小结登记状态：1待补录；2-已补录',
                                         `prescription_status` int(1) DEFAULT NULL COMMENT '开方状态：1已完成，0未开方',
                                         `prescription_code` varchar(100) DEFAULT NULL COMMENT '处方单号,多个用逗号隔开',
                                         `prescription_time` timestamp NULL DEFAULT NULL COMMENT '开方完成时间',
                                         `outpatient_id` varchar(50) DEFAULT NULL COMMENT '关联门诊记录',
                                         `type` tinyint(2) DEFAULT '1' COMMENT '发起类型（1本人发起 2家人待预约 3医生代预约）',
                                         `authorize_image` varchar(500) DEFAULT NULL COMMENT '电子健康卡授权图片',
                                         `relation_code` varchar(50) DEFAULT NULL COMMENT '业务关联',
                                         `service_status` varchar(15) DEFAULT NULL COMMENT '服务类型 1-预约项目 2-即时项目',
                                         `order_info` varchar(15) DEFAULT NULL COMMENT '工单详情 0-未推送 1-未确认 2-已确认',
                                         `shortcut_type` char(1) DEFAULT NULL COMMENT '快捷类型，1是快捷类型，其他值不是',
                                         `followup_date` varchar(50) DEFAULT NULL COMMENT '随访时间',
                                         `pay_status` tinyint(2) DEFAULT NULL COMMENT '0待扣费 1已支付 2已退款',
                                         PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='上门辅导服务工单';
-- 上门辅导服务工单价格明细
CREATE TABLE `base_door_coach_fee_detail` (
                                              `id` varchar(50) NOT NULL,
                                              `order_id` varchar(50) DEFAULT NULL COMMENT '工单id',
                                              `type` int(1) NOT NULL COMMENT '费用类型，1-服务项费用，2-医生出诊费用',
                                              `code` varchar(50) DEFAULT NULL COMMENT '居民请求的服务项code，医生出诊费用code',
                                              `name` varchar(50) DEFAULT NULL COMMENT '居民请求的服务项名称，医生出诊费用名称',
                                              `fee` decimal(10,2) DEFAULT NULL COMMENT '费用',
                                              `fee_discount` decimal(10,2) DEFAULT NULL COMMENT '折扣费用',
                                              `number` int(1) DEFAULT NULL COMMENT '数量',
                                              `status` int(1) NOT NULL COMMENT '状态，1-居民新增（预约），2-医生新增，3-医生删除',
                                              `create_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                              `create_user` varchar(50) DEFAULT NULL COMMENT '创建者id',
                                              `create_user_name` varchar(50) DEFAULT NULL COMMENT '创建者名称',
                                              `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                              `update_user` varchar(50) DEFAULT NULL,
                                              `update_user_name` varchar(50) DEFAULT NULL,
                                              `pay_status` tinyint(1) DEFAULT NULL COMMENT '付款状态：0未付款 1已付款',
                                              PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='上门辅导服务工单价格明细（服务项价格，医生出诊费用）';
-- 患者表
CREATE TABLE `base_patient` (
                                `id` varchar(50) NOT NULL COMMENT 'uuid,uuid唯一标识',
                                `saas_id` varchar(100) DEFAULT NULL COMMENT 'saas配置id',
                                `register` varchar(2) DEFAULT NULL COMMENT '是否注册过多码融合 1 注册 0 未注册',
                                `idcard` varchar(100) DEFAULT NULL COMMENT '身份证号',
                                `password` varchar(50) DEFAULT NULL COMMENT '登录密码',
                                `salt` varchar(50) DEFAULT NULL,
                                `name` varchar(50) DEFAULT NULL COMMENT '姓名',
                                `birthday` date DEFAULT NULL COMMENT '生日',
                                `sex` int(2) DEFAULT '3' COMMENT '性别，1男，2女',
                                `mobile` varchar(100) DEFAULT NULL COMMENT '手机号',
                                `phone` varchar(200) DEFAULT NULL COMMENT '联系电话',
                                `photo` varchar(100) DEFAULT NULL COMMENT '头像http地址',
                                `province_code` varchar(50) DEFAULT NULL COMMENT '省编码',
                                `province_name` varchar(50) DEFAULT NULL COMMENT '省名称',
                                `city_code` varchar(50) DEFAULT NULL COMMENT '市编码',
                                `city_name` varchar(50) DEFAULT NULL COMMENT '城市名称',
                                `town_code` varchar(50) DEFAULT NULL COMMENT '区县编码',
                                `town_name` varchar(100) DEFAULT NULL COMMENT '区县名称',
                                `street_code` varchar(50) DEFAULT NULL COMMENT '街道编码',
                                `street_name` varchar(100) DEFAULT NULL COMMENT '街道名称',
                                `committee_code` varchar(50) DEFAULT NULL COMMENT '居住居委会代码',
                                `committee_name` varchar(50) DEFAULT NULL COMMENT '居住居委会名称',
                                `address` varchar(200) DEFAULT NULL COMMENT '具体详细地址',
                                `points` varchar(100) DEFAULT NULL COMMENT '总积分',
                                `record_amount` varchar(100) DEFAULT NULL COMMENT '病历总数',
                                `openid` varchar(50) DEFAULT NULL COMMENT '微信编号',
                                `patient_status` varchar(100) DEFAULT NULL COMMENT '用户状态：1正常，0禁用，-1恶意注册，2审核中',
                                `mobile_remarks` varchar(200) DEFAULT NULL COMMENT '联系方式备注【基卫】',
                                `openid_time` datetime DEFAULT NULL COMMENT '第一次添加open的时间',
                                `standard_status` tinyint(4) DEFAULT NULL COMMENT '居民预警状态：0为标准，1为预警状态',
                                `unionid` varchar(50) DEFAULT NULL COMMENT 'unionId 开发平台唯一标识',
                                `del` varchar(1) DEFAULT '1' COMMENT '作废标识，1正常，0作废',
                                `login_date` timestamp NULL DEFAULT NULL COMMENT '登录时间',
                                `locked_date` timestamp NULL DEFAULT NULL COMMENT '锁定时间',
                                `locked` int(1) DEFAULT NULL COMMENT '是否被锁定；1为锁定，0为可用',
                                `enabled` int(1) DEFAULT NULL COMMENT '是否可用',
                                `remark` varchar(200) DEFAULT NULL COMMENT '备注',
                                `login_failure_count` int(1) DEFAULT NULL COMMENT '失败次数',
                                `last_login_failure_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                `create_user` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建人',
                                `create_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建人名',
                                `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
                                `update_user` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '修改人',
                                `update_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '修改人名',
                                `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
                                `live_town_code` varchar(20) DEFAULT NULL COMMENT '居住区名称',
                                `live_city_name` varchar(20) DEFAULT NULL COMMENT '居住城市名称',
                                `live_province_name` varchar(20) DEFAULT NULL COMMENT '居住省份',
                                `live_town_name` varchar(20) DEFAULT NULL COMMENT '居住区名称',
                                `live_province_code` varchar(20) DEFAULT NULL COMMENT '居住省份code',
                                `live_city_code` varchar(20) DEFAULT NULL COMMENT '居住城市',
                                `live_street_code` varchar(20) DEFAULT NULL COMMENT '居住街道代码',
                                `live_street_name` varchar(50) DEFAULT NULL COMMENT '居住街道名称',
                                `principal_code` varchar(50) DEFAULT NULL,
                                `user_id` varchar(100) DEFAULT NULL COMMENT '眼科通userId',
                                `ykt_id` varchar(50) DEFAULT NULL COMMENT '眼科通家庭id',
                                `on_line` int(10) DEFAULT NULL COMMENT '1上线2下线',
                                `card_type` varchar(50) DEFAULT NULL COMMENT '证件类型',
                                `alipay_id` varchar(50) DEFAULT NULL,
                                `marriage` int(11) DEFAULT NULL COMMENT '婚姻状况【10.未婚 20.已婚 30.丧偶 40.离婚 90.未说明的婚姻状况】',
                                `national` int(11) DEFAULT NULL COMMENT '民族',
                                `blood` int(11) DEFAULT NULL COMMENT '血型【1.A型 2.B型 3.O型 4.AB型 5.不详】',
                                `national_name` varchar(20) DEFAULT NULL COMMENT '民族名称',
                                `archive_status` tinyint(1) DEFAULT NULL COMMENT '档案状态【1.未管理 2.死亡 3.正常 4.高危】【必填】',
                                `archive_type` tinyint(2) DEFAULT NULL COMMENT '档案类型 1老人 2新生儿',
                                `medicare_number` varchar(50) DEFAULT NULL COMMENT '医疗保险号',
                                `ssc` varchar(50) DEFAULT NULL COMMENT '社保卡号',
                                `disease` varchar(50) DEFAULT NULL COMMENT '疾病',
                                `home_address` varchar(255) DEFAULT NULL COMMENT '现住地址',
                                `lat_lon` varchar(100) DEFAULT NULL COMMENT '定位经纬度',
                                `idcard_front` varchar(1000) DEFAULT NULL COMMENT '身份证正面',
                                `idcard_back` varchar(1000) DEFAULT NULL COMMENT '身份证反面',
                                `pad_imei` varchar(50) DEFAULT NULL COMMENT '平板imei',
                                `residential_area` varchar(50) DEFAULT NULL COMMENT '居住小区',
                                `sign_status` tinyint(1) DEFAULT NULL COMMENT '签约状态 1已签约 0未签约',
                                `medical_state` varchar(255) DEFAULT NULL COMMENT '医保是否授权',
                                `home_lat_lon` varchar(100) DEFAULT NULL COMMENT '居民家庭经纬度',
                                KEY `idx_mobile` (`mobile`) USING BTREE,
                                KEY `idx_openid` (`openid`) USING BTREE,
                                KEY `idx_name` (`name`),
                                KEY `idx_unionid` (`unionid`) USING BTREE,
                                KEY `idx_patient_idcard` (`idcard`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民信息（居民就是患者）';
-- 设备信息表
CREATE TABLE `wlyy_devices` (
                                `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
                                `apply_date` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '申请日期',
                                `org_name` varchar(255) DEFAULT NULL COMMENT '机构名称',
                                `linkman` varchar(255) DEFAULT NULL COMMENT '联系人',
                                `tel` varchar(255) DEFAULT NULL COMMENT '联系电话',
                                `server_ip` varchar(255) DEFAULT NULL COMMENT '服务IP地址',
                                `device_name` varchar(255) DEFAULT NULL COMMENT '设备名称',
                                `device_model` varchar(255) DEFAULT NULL COMMENT '型号',
                                `device_code` varchar(255) DEFAULT NULL COMMENT '设备唯一标识',
                                `manufacturer_code` varchar(255) DEFAULT NULL COMMENT '厂商代码',
                                `manufacturer` varchar(255) DEFAULT NULL COMMENT '厂家名称',
                                `address` varchar(255) DEFAULT NULL COMMENT '厂家地址',
                                `representative` varchar(255) DEFAULT NULL COMMENT '法人代表',
                                `applicant_name` varchar(255) DEFAULT NULL COMMENT '申请注册人',
                                `applicant_identity` varchar(255) DEFAULT NULL COMMENT '申请人身份证号',
                                `applicant_tel` varchar(255) DEFAULT NULL COMMENT '申请人手机',
                                `applicant_mail` varchar(255) DEFAULT NULL COMMENT '申请人邮箱',
                                `sim` varchar(50) DEFAULT NULL COMMENT 'sim卡号',
                                `manufacturer_id` varchar(50) DEFAULT NULL COMMENT '厂商id',
                                `is_grant` int(2) DEFAULT '0' COMMENT '是否发放（0否1是）',
                                `grant_admin_team` varchar(50) DEFAULT NULL COMMENT '发放的患者所在团队',
                                `grant_org_code` varchar(50) DEFAULT NULL COMMENT '发放所在机构',
                                `is_binding` int(2) DEFAULT '0' COMMENT '是否绑定（0否 1 是）',
                                `binding_count` varchar(50) DEFAULT NULL COMMENT '绑定次数（{"1":"0", "2":"0"}）',
                                `grant_time` datetime DEFAULT NULL COMMENT '发放时间',
                                `grant_doctor` varchar(50) DEFAULT NULL COMMENT '发放医生code',
                                `grant_doctor_name` varchar(50) DEFAULT NULL COMMENT '发放医生姓名',
                                `neighborhood_committee_code` varchar(12) DEFAULT NULL COMMENT '居委会code',
                                `neighborhood_committee_name` varchar(100) DEFAULT NULL COMMENT '居委会名称',
                                `device_type` tinyint(2) DEFAULT NULL COMMENT '设备种类 0健康设备 1安防设备',
                                `contact_status_time` datetime DEFAULT NULL COMMENT '失联状态更新时间',
                                `contact_status` tinyint(2) DEFAULT NULL COMMENT '失联状态 1未失联 0失联',
                                `iccid` varchar(20) DEFAULT NULL COMMENT '物联网卡iccid',
                                `imsi` varchar(20) DEFAULT NULL COMMENT '物联网卡IMSI',
                                `category_code` varchar(50) DEFAULT NULL COMMENT '设备类型 dm_device表定义',
                                `collect_num` int(10) DEFAULT NULL COMMENT '采集数据次数',
                                `abnormal_num` int(10) DEFAULT NULL COMMENT '异常指标数据次数',
                                PRIMARY KEY (`id`),
                                KEY `idx_device_code` (`device_code`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1561 DEFAULT CHARSET=utf8 COMMENT='厦门设备信息表';
-- 患者设备表
CREATE TABLE `wlyy_patient_device` (
                                       `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '业务无关键',
                                       `device_id` int(11) NOT NULL COMMENT '设备标识',
                                       `user` varchar(50) NOT NULL COMMENT '患者标识',
                                       `category_code` varchar(50) DEFAULT NULL COMMENT '设备类型标识1血糖仪，2.血压计，3药盒,4智能手表',
                                       `device_name` varchar(50) DEFAULT NULL COMMENT '设备名称',
                                       `device_sn` varchar(50) NOT NULL COMMENT '设备SN码',
                                       `user_type` varchar(50) NOT NULL COMMENT '身份标识',
                                       `user_idcard` varchar(50) NOT NULL COMMENT '关联身份证',
                                       `czrq` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '添加时间',
                                       `doctor` varchar(50) DEFAULT NULL COMMENT '帮忙绑定的医生',
                                       `doctor_name` varchar(50) DEFAULT NULL COMMENT '帮忙绑定医生姓名',
                                       `agent` varchar(50) DEFAULT NULL COMMENT '代绑人',
                                       `agent_name` varchar(50) DEFAULT NULL COMMENT '代绑人姓名',
                                       `del_user` varchar(50) DEFAULT NULL COMMENT '解绑人',
                                       `del` int(11) DEFAULT '0' COMMENT '1-解绑，0-绑定',
                                       `sim` varchar(50) DEFAULT NULL COMMENT 'sim卡号',
                                       `device_activity_type` varchar(50) DEFAULT NULL COMMENT '设备活动类型',
                                       `agreement_photo` varchar(300) DEFAULT NULL COMMENT '上传的协议图片地址',
                                       `hospital` varchar(50) DEFAULT NULL COMMENT '居民签约所在社区',
                                       `hospital_name` varchar(50) DEFAULT NULL COMMENT '居民签约居民社区名字',
                                       `check_doctor_name` varchar(255) DEFAULT NULL COMMENT '登记医生名字',
                                       `apply_status` int(11) DEFAULT '0' COMMENT '0未申请 1审核中 2被拒绝',
                                       `apply_reason` varchar(500) DEFAULT NULL COMMENT '居民申请理由',
                                       `refuse_reason` varchar(500) DEFAULT NULL COMMENT '医生拒绝理由',
                                       `sos_address` varchar(50) DEFAULT NULL COMMENT '设备类型为报警器时，需要填写投放地址 category_code = 7',
                                       `device_type` tinyint(2) DEFAULT NULL COMMENT '设备种类 0健康设备 1安防设备',
                                       `iot_device_sn` varchar(255) DEFAULT NULL COMMENT '绑定WiFi时对应的设备sn',
                                       `safe_area_gz` varchar(255) DEFAULT NULL COMMENT '绑定智能拐杖设备时，需要保存围栏地址',
                                       PRIMARY KEY (`id`),
                                       KEY `idx_wlyy_patient_device_1` (`user`),
                                       KEY `idx_device_sn` (`device_sn`)
) ENGINE=InnoDB AUTO_INCREMENT=284 DEFAULT CHARSET=utf8mb4 COMMENT='患者设备表';
-- 居民紧急救助服务工单
CREATE TABLE `base_emergency_assistance_order` (
                                                   `id` varchar(50) NOT NULL DEFAULT '',
                                                   `patient` varchar(50) DEFAULT NULL COMMENT '发起救助的居民id',
                                                   `patient_name` varchar(10) DEFAULT NULL COMMENT '发起救助的居民姓名',
                                                   `patient_phone` varchar(15) DEFAULT NULL COMMENT '救助居民电话',
                                                   `patient_idcard` varchar(200) DEFAULT NULL COMMENT '救助居民身份证',
                                                   `org_code` varchar(100) DEFAULT NULL COMMENT '救助居民所在机构code',
                                                   `org_name` varchar(100) DEFAULT NULL COMMENT '救助居民所在机构名称',
                                                   `serve_address` varchar(100) DEFAULT NULL COMMENT '居民当前定位地址',
                                                   `serve_lat` varchar(100) DEFAULT NULL COMMENT '居民当前定位地址纬度',
                                                   `serve_lon` varchar(100) DEFAULT NULL COMMENT '居民当前定位地址经度',
                                                   `session_id` varchar(150) DEFAULT NULL COMMENT '会话id',
                                                   `doctor` varchar(50) DEFAULT NULL COMMENT '医生code',
                                                   `doctor_name` varchar(50) DEFAULT NULL COMMENT '医生name',
                                                   `doctor_address` varchar(100) DEFAULT NULL COMMENT '医生当前定位地址',
                                                   `doctor_lat` varchar(100) DEFAULT NULL COMMENT '医生当定位地址纬度',
                                                   `doctor_lon` varchar(100) DEFAULT NULL COMMENT '医生当前定位地址经度',
                                                   `conclusion` varchar(100) DEFAULT NULL COMMENT '服务完成笔记',
                                                   `conclusion_img` varchar(1000) DEFAULT NULL COMMENT '服务相关附件',
                                                   `status` tinyint(4) DEFAULT '1' COMMENT '工单状态 -1已取消 0已完成 1申请中',
                                                   `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
                                                   `create_user` varchar(50) DEFAULT NULL COMMENT '创建者id',
                                                   `create_user_name` varchar(50) DEFAULT NULL COMMENT '创建者名称',
                                                   `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                                   `update_user` varchar(50) DEFAULT NULL,
                                                   `update_user_name` varchar(50) DEFAULT NULL,
                                                   `complete_time` timestamp NULL DEFAULT NULL COMMENT '医生确认完成时间',
                                                   `team_code` varchar(100) DEFAULT NULL COMMENT '服务团队',
                                                   `proxy_patient` varchar(50) DEFAULT NULL COMMENT '代理发起工单的居民code，替父母，孩子等发起工单',
                                                   `proxy_patient_name` varchar(10) DEFAULT NULL COMMENT '代理发起工单的居民code，替父母，孩子等发起工单',
                                                   `proxy_patient_phone` varchar(15) DEFAULT NULL COMMENT '代理发起工单的居民联系电话',
                                                   `type` tinyint(2) DEFAULT '1' COMMENT '发起类型（1本人发起 2家人待预约 3医生代预约）',
                                                   `order_source` tinyint(4) DEFAULT '1' COMMENT '工单发起来源状态 1APP 2手环3居家报警',
                                                   `emergency_cancel` tinyint(4) DEFAULT '4' COMMENT '紧急预警工单误报警原因 emergency_cancel',
                                                   `device_sn` varchar(50) DEFAULT NULL COMMENT '设备触发工单时有该字段',
                                                   PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='居民紧急救助服务工单';
-- 服务工单价格明细
CREATE TABLE `base_life_care_fee_detail` (
                                             `id` varchar(50) NOT NULL,
                                             `order_id` varchar(50) DEFAULT NULL COMMENT '工单id',
                                             `type` int(1) DEFAULT NULL COMMENT '费用类型，1-服务项费用，2-医生出诊费用',
                                             `code` varchar(50) DEFAULT NULL COMMENT '居民请求的服务项code，医生出诊费用code',
                                             `name` varchar(50) DEFAULT NULL COMMENT '居民请求的服务项名称，医生出诊费用名称',
                                             `fee` decimal(10,2) DEFAULT NULL COMMENT '费用',
                                             `fee_discount` decimal(10,2) DEFAULT NULL COMMENT '折扣费用',
                                             `number` int(1) DEFAULT NULL COMMENT '数量',
                                             `status` int(1) DEFAULT NULL COMMENT '状态，1-居民新增（预约），2-医生新增，3-医生删除',
                                             `create_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                             `create_user` varchar(50) DEFAULT NULL COMMENT '创建者id',
                                             `create_user_name` varchar(50) DEFAULT NULL COMMENT '创建者名称',
                                             `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                             `update_user` varchar(50) DEFAULT NULL,
                                             `update_user_name` varchar(50) DEFAULT NULL,
                                             `pay_status` tinyint(1) DEFAULT NULL COMMENT '付款状态：0未付款 1已付款',
                                             PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='服务工单价格明细（服务项价格，医生出诊费用）';
-- 生活照料工单
CREATE TABLE `base_life_care_order` (
                                        `id` varchar(50) NOT NULL DEFAULT '',
                                        `number` varchar(50) DEFAULT NULL COMMENT '服务编号',
                                        `proxy_patient` varchar(50) DEFAULT NULL COMMENT '代理发起工单的居民code，替父母，孩子等发起工单',
                                        `proxy_patient_name` varchar(10) DEFAULT NULL COMMENT '代理发起工单的居民code，替父母，孩子等发起工单',
                                        `proxy_patient_phone` varchar(15) DEFAULT NULL COMMENT '代理发起工单的居民联系电话',
                                        `patient` varchar(50) DEFAULT NULL COMMENT '被服务的居民code，发起工单的居民的亲属',
                                        `patient_name` varchar(10) DEFAULT NULL COMMENT '被服务的居民姓名，发起工单的居民的亲属',
                                        `patient_phone` varchar(15) DEFAULT NULL COMMENT '被服务的居民联系电话',
                                        `patient_relation` varchar(10) DEFAULT NULL COMMENT '发起人与被服务人的关系：自己，父亲，母亲，儿子等',
                                        `patient_expected_serve_time` varchar(200) DEFAULT NULL COMMENT '居民期望服务时间',
                                        `serve_desc` varchar(200) DEFAULT NULL COMMENT '居民自己服务描述',
                                        `serve_town` varchar(100) DEFAULT NULL COMMENT '服务的区',
                                        `serve_address` varchar(100) DEFAULT NULL COMMENT '服务详细地址',
                                        `serve_lat` varchar(100) DEFAULT NULL COMMENT '服务地址纬度',
                                        `serve_lon` varchar(100) DEFAULT NULL COMMENT '服务地址经度',
                                        `remark` varchar(200) DEFAULT NULL COMMENT '备注',
                                        `total_fee` decimal(10,2) DEFAULT NULL COMMENT '服务总的支付费用',
                                        `doctor` varchar(50) DEFAULT NULL COMMENT '接单的医生code',
                                        `doctor_name` varchar(50) DEFAULT NULL COMMENT '接单的医生name',
                                        `doctor_type` varchar(50) DEFAULT NULL COMMENT '接单的医生类型：医生，健管师，护士等',
                                        `complete_imgs` varchar(3000) DEFAULT NULL COMMENT '医生完成现场照片，最多6张，逗号分隔',
                                        `complete_remark` varchar(2000) DEFAULT NULL COMMENT '服务完成笔记',
                                        `status` int(1) DEFAULT NULL COMMENT '工单状态：待服务 1、已完成 2 、已取消 -1',
                                        `complete_time` timestamp NULL DEFAULT NULL COMMENT '工单完成时间（对工单评价完即工单完成）',
                                        `cancel_type` int(1) DEFAULT NULL COMMENT '取消类型：1-调度员取消，2-居民取消,3-医生取消',
                                        `cancel_reason` varchar(200) DEFAULT NULL COMMENT '取消理由',
                                        `cancel_time` timestamp NULL DEFAULT NULL COMMENT '取消时间',
                                        `pay_way` int(1) DEFAULT NULL COMMENT '付款方式：1-微信支付，2-线下支付（居民自己向医院支付，具体怎么支付由医院来定）',
                                        `pay_number` varchar(100) DEFAULT NULL COMMENT '支付流水号',
                                        `pay_time` timestamp NULL DEFAULT NULL COMMENT '支付时间',
                                        `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
                                        `create_user` varchar(50) DEFAULT NULL COMMENT '创建者id',
                                        `create_user_name` varchar(50) DEFAULT NULL COMMENT '创建者名称',
                                        `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                        `update_user` varchar(50) DEFAULT NULL,
                                        `update_user_name` varchar(50) DEFAULT NULL,
                                        `expected_doctor_name` varchar(10) DEFAULT '' COMMENT '居民期望服务的医生姓名',
                                        `hospital` varchar(50) DEFAULT NULL COMMENT '服务机构',
                                        `hospital_name` varchar(50) DEFAULT NULL COMMENT '机构名称',
                                        `type` tinyint(2) DEFAULT '1' COMMENT '发起类型（1本人发起 2家人待预约 3医生代预约）',
                                        `relation_code` varchar(50) DEFAULT NULL COMMENT '业务关联',
                                        `doctor_sign_time` datetime DEFAULT NULL COMMENT '医生签到时间',
                                        `doctor_sign_way` tinyint(1) DEFAULT NULL COMMENT '医生签到方式：1-定位，2-扫码，3-拍照',
                                        `doctor_sign_location` varchar(50) DEFAULT NULL COMMENT '医生签到位置，记录详细地址',
                                        `doctor_sign_img` varchar(3000) DEFAULT NULL COMMENT '医生签到照片',
                                        `sign_doctor` varchar(50) DEFAULT NULL COMMENT '签到医生',
                                        `sign_doctor_name` varchar(50) DEFAULT NULL COMMENT '签到医生name',
                                        `conclusion_imgs` varchar(3000) DEFAULT NULL COMMENT '小结照片',
                                        `conclusion_time` datetime DEFAULT NULL COMMENT '小结时间',
                                        `conclusion_remark` varchar(1200) DEFAULT NULL COMMENT '小结内容',
                                        `pay_status` tinyint(2) DEFAULT NULL COMMENT '0待扣费 1已支付 2已退款',
                                        PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='生活照料工单';
-- 安防监护服务工单
CREATE TABLE `base_security_monitoring_order` (
                                                  `id` varchar(50) NOT NULL DEFAULT '',
                                                  `number` varchar(50) DEFAULT NULL COMMENT '服务编号',
                                                  `patient` varchar(50) DEFAULT NULL COMMENT '被服务的居民code，发起工单的居民的亲属',
                                                  `patient_name` varchar(10) DEFAULT NULL COMMENT '被服务的居民姓名，发起工单的居民的亲属',
                                                  `patient_phone` varchar(15) DEFAULT NULL COMMENT '被服务的居民联系电话',
                                                  `serve_desc` varchar(200) DEFAULT NULL COMMENT '居民自己服务描述',
                                                  `serve_town` varchar(100) DEFAULT NULL COMMENT '安防监护服务的区',
                                                  `serve_address` varchar(100) DEFAULT NULL COMMENT '安防监护服务详细地址',
                                                  `serve_lat` varchar(100) DEFAULT NULL COMMENT '安防监护服务地址纬度',
                                                  `serve_lon` varchar(100) DEFAULT NULL COMMENT '安防监护服务地址经度',
                                                  `remark` varchar(200) DEFAULT NULL COMMENT '备注',
                                                  `doctor` varchar(50) DEFAULT NULL COMMENT '接单的医生code',
                                                  `doctor_name` varchar(50) DEFAULT NULL COMMENT '接单的医生name',
                                                  `doctor_type` varchar(50) DEFAULT NULL COMMENT '接单的医生类型：医生，健管师，护士等',
                                                  `doctor_arriving_time` varchar(200) DEFAULT NULL COMMENT '医生预计到达时间',
                                                  `doctor_sign_time` timestamp NULL DEFAULT NULL COMMENT '医生签到时间',
                                                  `doctor_sign_way` int(1) DEFAULT NULL COMMENT '医生签到方式：1-定位，2-扫码，3-拍照',
                                                  `doctor_sign_location` varchar(50) DEFAULT NULL COMMENT '医生签到位置，记录详细地址',
                                                  `doctor_sign_img` varchar(3000) DEFAULT NULL COMMENT '医生签到照片',
                                                  `present_imgs` varchar(3000) DEFAULT NULL COMMENT '医生诊疗现场照片，最多9张，逗号分隔',
                                                  `exam_paper_status` int(1) DEFAULT NULL COMMENT '是否需要上传补录报告：0-不需要，1-需要，待补录；2-需要，已补录',
                                                  `exam_paper_imgs` varchar(3000) DEFAULT NULL COMMENT '医生上传居民的检查报告照片',
                                                  `exam_paper_upload_time` timestamp NULL DEFAULT NULL COMMENT '检查报告补录时间',
                                                  `exam_paper_upload_way` int(1) DEFAULT NULL COMMENT '检查报告补录方式，1-拍照补录，2-接口数据',
                                                  `status` int(1) DEFAULT NULL COMMENT '工单状态：-1-已取消，1-待处置，2-前往居民定位，3-已签到，4-已登记小结,5-待补录，6-待评价，7-已完成',
                                                  `complete_time` timestamp NULL DEFAULT NULL COMMENT '工单完成时间（对工单评价完即工单完成）',
                                                  `cancel_type` int(1) DEFAULT NULL COMMENT '取消类型：1-调度员取消，2-居民取消,3-医生取消',
                                                  `cancel_reason` varchar(200) DEFAULT NULL COMMENT '取消理由',
                                                  `cancel_time` timestamp NULL DEFAULT NULL COMMENT '取消时间',
                                                  `service_response_time` timestamp NULL DEFAULT NULL COMMENT '服务医生响应时间（第一条咨询或者接单时间）',
                                                  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
                                                  `create_user` varchar(50) DEFAULT NULL COMMENT '创建者id',
                                                  `create_user_name` varchar(50) DEFAULT NULL COMMENT '创建者名称',
                                                  `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                                  `update_user` varchar(50) DEFAULT NULL,
                                                  `update_user_name` varchar(50) DEFAULT NULL,
                                                  `hospital` varchar(50) DEFAULT NULL COMMENT '服务机构',
                                                  `conclusion_status` int(1) DEFAULT NULL COMMENT '服务小结登记状态：1待补录；2-已补录',
                                                  `type` tinyint(2) DEFAULT '1' COMMENT '发起类型（1本人发起 2家人待预约 3医生代预约）',
                                                  `authorize_image` varchar(500) DEFAULT NULL COMMENT '电子健康卡授权图片',
                                                  `relation_code` varchar(50) DEFAULT NULL COMMENT '业务关联',
                                                  `service_status` varchar(15) DEFAULT NULL COMMENT '服务类型 1-预约项目 2-即时项目',
                                                  `order_info` varchar(15) DEFAULT NULL COMMENT '工单详情 0-未推送 1-未确认 2-已确认',
                                                  `doctor_confirm_finish_img` varchar(3000) DEFAULT NULL COMMENT '医生确认完成照片',
                                                  `doctor_confirm_finish_time` timestamp NULL DEFAULT NULL COMMENT '医生确认完成时间',
                                                  `order_source` tinyint(4) DEFAULT '1' COMMENT '工单发起来源状态 1APP 2手环3居家报警',
                                                  `emergency_cancel` tinyint(4) DEFAULT '4' COMMENT '紧急预警工单误报警原因 emergency_cancel',
                                                  `topic_item` varchar(50) DEFAULT 'preventLost' COMMENT '安防工单所属专题 base_system_dict_entry表service_item',
                                                  `scene_img` varchar(1000) DEFAULT NULL COMMENT '现场照片',
                                                  `device_sn` varchar(50) DEFAULT NULL COMMENT '设备触发工单时有该字段',
                                                  `warn_info` varchar(3000) DEFAULT NULL COMMENT '触发工单时信息如 烟雾心率等',
                                                  PRIMARY KEY (`id`),
                                                  KEY `idx_topIt` (`topic_item`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='安防监护服务工单';
-- 服务项
CREATE TABLE `base_service_package_item` (
                                             `id` varchar(50) CHARACTER SET utf8 NOT NULL,
                                             `code` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '服务项code',
                                             `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '服务项名称',
                                             `service_package_id` varchar(50) COLLATE utf8_unicode_ci DEFAULT 'system' COMMENT '服务包id',
                                             `price` decimal(11,2) DEFAULT '0.00' COMMENT '价格',
                                             `fee_type` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '收费标准（1免费）',
                                             `org_code` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '机构编码',
                                             `org_name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '机构名称',
                                             `introduce` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '服务简介',
                                             `del` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '是否生效(1 生效，0 失效)',
                                             `create_time` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
                                             `dict_id` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
                                             `topic_item` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '服务项所属专题(base_system_dict_entry remark字段) security 安防服务专题',
                                             PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT COMMENT='服务项';

svr/svr-cloud-job/src/main/resources/application.yml

@@ -81,7 +81,7 @@ spring:
      username: ssgg
      password: ssgg@jkzl2019
    zhylyjkglxt:
      url: jdbc:mysql://172.26.0.104/gsq_zhjd_zhylyjkglxt?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      jdbcUrl: jdbc:mysql://172.26.0.104/gsq_zhjd_zhylyjkglxt?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      username: ssgg
      password: ssgg@jkzl2019
  activemq:

svr/svr-cloud-job/src/main/resources/system.properties

@@ -27,4 +27,7 @@ DEVICE_LOST_ASSOCIATION_JOB=0 0 0/2 * * ?
EME_WARNING_OVERTIME_NOT_RESPONSE=0 0 * * * ?
#\u7D27\u6025\u9884\u8B66\u5DE5\u5355\u8D85\u65F6\u672A\u54CD\u5E94\u63A8\u9001\u5F39\u68462
EME_WARNING_OVERTIME_NOT_RESPONSE_DAY=0 30 9 * * ?
EME_WARNING_OVERTIME_NOT_RESPONSE_DAY=0 30 9 * * ?
#\u5B9A\u65F6\u63A8\u9001\u4FDD\u5B58\u6570\u636E
SAVE_DATA_PUSH_JOB= 0 0 23 * * ?

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

@@ -12,6 +12,7 @@ import com.yihu.jw.im.service.ImService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionDiagnosisVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
@@ -632,4 +633,208 @@ public class HcyyPrescriptionCotroller extends EnvelopRestEndpoint {
        return ObjEnvelop.getSuccess("ok",hcyyEntranceService.BrowseSingleEMR(bstrEmrID));
    }
    /**
     * 合理用药审核
     * @param patient 病人id
     * @param doctor 医生id
     * @param diagnosisDOS 诊断json
     * @param infos  药品json
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/hcyyCheckInfo")
    @ApiOperation(value = "合理用药审核")
    public Envelop hcyyCheckInfo(
            @ApiParam(name = "outpatient", value = "就诊表id")
            @RequestParam(value = "outpatient", defaultValue = "") String outpatient,
            @ApiParam(name = "prescriptionOnly", value = "处方唯一标识")
            @RequestParam(value = "prescriptionOnly", defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "payType", value = "付款方式0自费；1医保")
            @RequestParam(value = "payType", defaultValue = "") String payType,
            @ApiParam(name = "doctor", value = "医生id")
            @RequestParam(value = "doctor", defaultValue = "") String doctor,
            @ApiParam(name = "patient", value = "病人id")
            @RequestParam(value = "patient", defaultValue = "") String patient,
            @ApiParam(name = "diagnosisDOS", value = "诊断json")
            @RequestParam(value = "diagnosisDOS", defaultValue = "") String diagnosisDOS,
            @ApiParam(name = "infos", value = "药品json")
            @RequestParam(value = "infos", defaultValue = "") String infos) throws Exception {
        JSONArray druginfos = JSONArray.parseArray(infos);
        List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = new ArrayList<>();
        for (int i = 0; i < druginfos.size(); i++) {
            WlyyPrescriptionInfoDO wlyyPrescriptionInfo = toEntity(druginfos.get(i).toString(), WlyyPrescriptionInfoDO.class);
            wlyyPrescriptionInfoDOS.add(wlyyPrescriptionInfo);
        }
        JSONArray diagnosis = JSONArray.parseArray(diagnosisDOS);
        List<WlyyPrescriptionDiagnosisDO> wlyyPrescriptionDiagnosisDOS = new ArrayList<>();
        for (int i = 0; i < diagnosis.size(); i++) {
            WlyyPrescriptionDiagnosisDO wlyyPrescriptionDiagnosisDO = toEntity(diagnosis.get(i).toString(), WlyyPrescriptionDiagnosisDO.class);
            wlyyPrescriptionDiagnosisDOS.add(wlyyPrescriptionDiagnosisDO);
        }
        return success(hcyyEntranceService.checkPrescriptions(outpatient,prescriptionOnly,payType,patient,doctor,wlyyPrescriptionInfoDOS,wlyyPrescriptionDiagnosisDOS));
    }
    /**
     * 处方在医生站系统成功保存后调用
     * @param patient 病人id
     * @param doctor 医生id
     * @param diagnosisDOS 诊断json
     * @param infos  药品json
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/hcyySaveCheckInfo")
    @ApiOperation(value = "处方在医生站系统成功保存后调用")
    public Envelop hcyySaveCheckInfo(
            @ApiParam(name = "outpatient", value = "就诊表id")
            @RequestParam(value = "outpatient", defaultValue = "") String outpatient,
            @ApiParam(name = "prescriptionOnly", value = "处方唯一标识")
            @RequestParam(value = "prescriptionOnly", defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "payType", value = "付款方式0自费；1医保")
            @RequestParam(value = "payType", defaultValue = "") String payType,
            @ApiParam(name = "doctor", value = "医生id")
            @RequestParam(value = "doctor", defaultValue = "") String doctor,
            @ApiParam(name = "patient", value = "病人id")
            @RequestParam(value = "patient", defaultValue = "") String patient,
            @ApiParam(name = "diagnosisDOS", value = "诊断json")
            @RequestParam(value = "diagnosisDOS", defaultValue = "") String diagnosisDOS,
            @ApiParam(name = "infos", value = "药品json")
            @RequestParam(value = "infos", defaultValue = "") String infos) throws Exception {
        JSONArray druginfos = JSONArray.parseArray(infos);
        List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = new ArrayList<>();
        for (int i = 0; i < druginfos.size(); i++) {
            WlyyPrescriptionInfoDO wlyyPrescriptionInfo = toEntity(druginfos.get(i).toString(), WlyyPrescriptionInfoDO.class);
            wlyyPrescriptionInfoDOS.add(wlyyPrescriptionInfo);
        }
        JSONArray diagnosis = JSONArray.parseArray(diagnosisDOS);
        List<WlyyPrescriptionDiagnosisDO> wlyyPrescriptionDiagnosisDOS = new ArrayList<>();
        for (int i = 0; i < diagnosis.size(); i++) {
            WlyyPrescriptionDiagnosisDO wlyyPrescriptionDiagnosisDO = toEntity(diagnosis.get(i).toString(), WlyyPrescriptionDiagnosisDO.class);
            wlyyPrescriptionDiagnosisDOS.add(wlyyPrescriptionDiagnosisDO);
        }
        return success(hcyyEntranceService.saveCheck(outpatient,prescriptionOnly,payType,patient,doctor,wlyyPrescriptionInfoDOS,wlyyPrescriptionDiagnosisDOS));
    }
    /**
     * 处方保存成功后，发送给审方系统进行人工审方
     * @param patient 病人id
     * @param doctor 医生id
     * @param diagnosisDOS 诊断json
     * @param infos  药品json
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/hcyyValidCheckInfo")
    @ApiOperation(value = "人工审方")
    public Envelop hcyyValidCheckInfo(
            @ApiParam(name = "outpatient", value = "就诊表id")
            @RequestParam(value = "outpatient", defaultValue = "") String outpatient,
            @ApiParam(name = "prescriptionOnly", value = "处方唯一标识")
            @RequestParam(value = "prescriptionOnly", defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "payType", value = "付款方式0自费；1医保")
            @RequestParam(value = "payType", defaultValue = "") String payType,
            @ApiParam(name = "doctor", value = "医生id")
            @RequestParam(value = "doctor", defaultValue = "") String doctor,
            @ApiParam(name = "patient", value = "病人id")
            @RequestParam(value = "patient", defaultValue = "") String patient,
            @ApiParam(name = "diagnosisDOS", value = "诊断json")
            @RequestParam(value = "diagnosisDOS", defaultValue = "") String diagnosisDOS,
            @ApiParam(name = "infos", value = "药品json")
            @RequestParam(value = "infos", defaultValue = "") String infos) throws Exception {
        JSONArray druginfos = JSONArray.parseArray(infos);
        List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = new ArrayList<>();
        for (int i = 0; i < druginfos.size(); i++) {
            WlyyPrescriptionInfoDO wlyyPrescriptionInfo = toEntity(druginfos.get(i).toString(), WlyyPrescriptionInfoDO.class);
            wlyyPrescriptionInfoDOS.add(wlyyPrescriptionInfo);
        }
        JSONArray diagnosis = JSONArray.parseArray(diagnosisDOS);
        List<WlyyPrescriptionDiagnosisDO> wlyyPrescriptionDiagnosisDOS = new ArrayList<>();
        for (int i = 0; i < diagnosis.size(); i++) {
            WlyyPrescriptionDiagnosisDO wlyyPrescriptionDiagnosisDO = toEntity(diagnosis.get(i).toString(), WlyyPrescriptionDiagnosisDO.class);
            wlyyPrescriptionDiagnosisDOS.add(wlyyPrescriptionDiagnosisDO);
        }
        return success(hcyyEntranceService.validCheck(outpatient,prescriptionOnly,payType,patient,doctor,wlyyPrescriptionInfoDOS,wlyyPrescriptionDiagnosisDOS));
    }
    /**
     * 删除已保存处方
     * @param patient 病人id
     * @param doctor 医生id
     * @param diagnosisDOS 诊断json
     * @param infos  药品json
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/hcyyDeleteInfo")
    @ApiOperation(value = "删除已保存处方时调用")
    public Envelop hcyyDeleteInfo(
            @ApiParam(name = "outpatient", value = "就诊表id")
            @RequestParam(value = "outpatient", defaultValue = "") String outpatient,
            @ApiParam(name = "prescriptionOnly", value = "处方唯一标识")
            @RequestParam(value = "prescriptionOnly", defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "payType", value = "付款方式0自费；1医保")
            @RequestParam(value = "payType", defaultValue = "") String payType,
            @ApiParam(name = "doctor", value = "医生id")
            @RequestParam(value = "doctor", defaultValue = "") String doctor,
            @ApiParam(name = "patient", value = "病人id")
            @RequestParam(value = "patient", defaultValue = "") String patient,
            @ApiParam(name = "diagnosisDOS", value = "诊断json")
            @RequestParam(value = "diagnosisDOS", defaultValue = "") String diagnosisDOS,
            @ApiParam(name = "infos", value = "药品json")
            @RequestParam(value = "infos", defaultValue = "") String infos) throws Exception {
        JSONArray druginfos = JSONArray.parseArray(infos);
        List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = new ArrayList<>();
        for (int i = 0; i < druginfos.size(); i++) {
            WlyyPrescriptionInfoDO wlyyPrescriptionInfo = toEntity(druginfos.get(i).toString(), WlyyPrescriptionInfoDO.class);
            wlyyPrescriptionInfoDOS.add(wlyyPrescriptionInfo);
        }
        JSONArray diagnosis = JSONArray.parseArray(diagnosisDOS);
        List<WlyyPrescriptionDiagnosisDO> wlyyPrescriptionDiagnosisDOS = new ArrayList<>();
        for (int i = 0; i < diagnosis.size(); i++) {
            WlyyPrescriptionDiagnosisDO wlyyPrescriptionDiagnosisDO = toEntity(diagnosis.get(i).toString(), WlyyPrescriptionDiagnosisDO.class);
            wlyyPrescriptionDiagnosisDOS.add(wlyyPrescriptionDiagnosisDO);
        }
        return success(hcyyEntranceService.deletePrescription(outpatient,prescriptionOnly,payType,patient,doctor,wlyyPrescriptionInfoDOS,wlyyPrescriptionDiagnosisDOS));
    }
    /**
     * 医生在对药师打回的处方进行双签处理后，医生站将双签信息推送给审方系统
     * @param patient 病人id
     * @param doctor 医生id
     * @param diagnosisDOS 诊断json
     * @param infos  药品json
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/hcyyDoubleSign")
    @ApiOperation(value = "医生在对药师打回的处方进行双签处理后，医生站将双签信息推送给审方系统")
    public Envelop hcyyDoubleSign(
            @ApiParam(name = "outpatient", value = "就诊表id")
            @RequestParam(value = "outpatient", defaultValue = "") String outpatient,
            @ApiParam(name = "prescriptionOnly", value = "处方唯一标识")
            @RequestParam(value = "prescriptionOnly", defaultValue = "") String prescriptionOnly,
            @ApiParam(name = "payType", value = "付款方式0自费；1医保")
            @RequestParam(value = "payType", defaultValue = "") String payType,
            @ApiParam(name = "doctor", value = "医生id")
            @RequestParam(value = "doctor", defaultValue = "") String doctor,
            @ApiParam(name = "patient", value = "病人id")
            @RequestParam(value = "patient", defaultValue = "") String patient,
            @ApiParam(name = "diagnosisDOS", value = "诊断json")
            @RequestParam(value = "diagnosisDOS", defaultValue = "") String diagnosisDOS,
            @ApiParam(name = "infos", value = "药品json")
            @RequestParam(value = "infos", defaultValue = "") String infos) throws Exception {
        JSONArray druginfos = JSONArray.parseArray(infos);
        List<WlyyPrescriptionInfoDO> wlyyPrescriptionInfoDOS = new ArrayList<>();
        for (int i = 0; i < druginfos.size(); i++) {
            WlyyPrescriptionInfoDO wlyyPrescriptionInfo = toEntity(druginfos.get(i).toString(), WlyyPrescriptionInfoDO.class);
            wlyyPrescriptionInfoDOS.add(wlyyPrescriptionInfo);
        }
        JSONArray diagnosis = JSONArray.parseArray(diagnosisDOS);
        List<WlyyPrescriptionDiagnosisDO> wlyyPrescriptionDiagnosisDOS = new ArrayList<>();
        for (int i = 0; i < diagnosis.size(); i++) {
            WlyyPrescriptionDiagnosisDO wlyyPrescriptionDiagnosisDO = toEntity(diagnosis.get(i).toString(), WlyyPrescriptionDiagnosisDO.class);
            wlyyPrescriptionDiagnosisDOS.add(wlyyPrescriptionDiagnosisDO);
        }
        return success(hcyyEntranceService.doubleSign(outpatient,prescriptionOnly,payType,patient,doctor,wlyyPrescriptionInfoDOS,wlyyPrescriptionDiagnosisDOS));
    }
}