新增在线开检验单接口

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

@@ -2215,7 +2215,7 @@ public class YkyyEntranceService {
        }
    }
    //查询组套项目
    public JSONObject findYzztByGslb(String gslb) throws Exception {
    public JSONArray findYzztByGslb(String gslb) throws Exception {
        String sql = "select t.ztmc as\"ztmc\",t.ztid as\"ztid\"," +
                "t.gslb as\"gslb\",t.gsdm as\"gsdm\"," +
                "t.pydm as\"pydm\",t.Mzsy as\"Mzsy\"" +
@@ -2223,6 +2223,7 @@ public class YkyyEntranceService {
        if(StringUtils.isNotEmpty(gslb)){
            sql+=" and t.gslb = "+Integer.valueOf(gslb);
            }
        System.out.println(sql);
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("findYzztByGslb："+sql);
@@ -2231,21 +2232,22 @@ public class YkyyEntranceService {
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status!=null&&status == 200){
            return rs;
        }else {
            return null;
        JSONArray array= new JSONArray();
        if (status==200){
            array = rs.getJSONArray("detailModelList");
        }
       return array;
    }
    //根据组套项目id查询组套明细
    public JSONObject findZtmxByid(String ztId) throws Exception{
    public JSONArray findZtmxByid(String ztId) throws Exception{
        String sql = "select t.ztid as \"ztid\",t.xmdm as \"xmdm\"," +
                "t.xmmc as \"xmmc\",t.mrsl as \"mrsl\",t.zxks as \"zxks\"" +
                "from portal_his.emr_ztmx@ykzxtest t where 1=1";
        if (StringUtils.isNotEmpty(ztId)){
            sql += " and t.ztid = '"+ztId+"'";
        }
        System.out.println(sql);
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("findZtmxByid："+sql);
@@ -2254,21 +2256,22 @@ public class YkyyEntranceService {
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status!=null&&status == 200){
            return rs;
        }else {
            return null;
        JSONArray array= new JSONArray();
        if (status==200){
            array = rs.getJSONArray("detailModelList");
        }
        return array;
    }
    //查询诊疗项目视图
    public JSONObject findZlxm(String itemName) throws Exception{
    public JSONArray findZlxm(String itemName) throws Exception{
        String sql = "select t.item_code as \"itemCode\",t.item_name as \"itemName\"," +
                "t.price as \"price\",t.total_unit as \"totalUnit\"," +
                "t. from VEMR_ORDER_ITEM t where 1=1";
                "t.zxks as \"zxks\" from VEMR_ORDER_ITEM t where 1=1";
        if (StringUtils.isNotEmpty(itemName)){
            sql+=" and t.ITEM_NAME like '%"+itemName+"%'";
        }
        System.out.println(sql);
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("findZlxm："+sql);
@@ -2277,19 +2280,20 @@ public class YkyyEntranceService {
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status!=null&&status == 200){
            return rs;
        }else {
            return null;
        JSONArray array= new JSONArray();
        if (status==200){
            array = rs.getJSONArray("detailModelList");
        }
        return array;
    }
    //查询诊疗项目明细视图
    public JSONObject findZlxmMx(String zlxmId) throws Exception{
    public JSONArray findZlxmMx(String zlxmId) throws Exception{
        String sql = "select t.zlxmid as \"zlxmid\",t.fyxh as \"fyxh\",t.fysl \"fysl\"" +
                " from VEMR_ORDER_ITEM_MX t where 1=1";
        if (StringUtils.isNotEmpty(zlxmId)){
            sql+=" and t.item_name like '%"+zlxmId+"%'";
            sql+=" and t.zlxmid = '"+zlxmId+"'";
        }
        System.out.println(sql);
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("findZlxmMx："+sql);
@@ -2298,14 +2302,14 @@ public class YkyyEntranceService {
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status!=null&&status == 200){
            return rs;
        }else {
            return null;
        JSONArray array= new JSONArray();
        if (status==200){
            array = rs.getJSONArray("detailModelList");
        }
        return array;
    }
    //his.gy_ylsf明细查询
    public JSONObject findGyYlsf(String fyxh) throws Exception{
    public JSONArray findGyYlsf(String fyxh) throws Exception{
        String sql = "select t.xmlx as \"xmlx\",t.fydj as \"fydj\",t.fygb as \"fygb\"" +
                "from portal_his.GY_YLSF@ykzxtest t where 1=1";
        if (StringUtils.isNotEmpty(fyxh)){
@@ -2319,21 +2323,72 @@ public class YkyyEntranceService {
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if (status!=null&&status == 200){
            return rs;
        }else {
            return null;
        JSONArray array= new JSONArray();
        if (status==200){
            array = rs.getJSONArray("detailModelList");
        }
        return array;
    }
    //门诊开单操作
    public String outPatientOrder(String jsonDate) throws Exception{
    public String outPatientOrder(String jsonDate,Boolean demoFlag,String doctor,String patient) throws Exception{
        List<YkEmrJcsqDO> surveys = EntityUtils.jsonToList(jsonDate, YkEmrJcsqDO.class);
        DoctorMappingDO doctorMappingDO = new DoctorMappingDO();
        PatientMappingDO patientMappingDO =new PatientMappingDO();
        if (StringUtils.isNotEmpty(doctor)){
            doctorMappingDO = doctorMappingDao.findByDoctor(doctor);
        }
        if(StringUtils.isNotEmpty(patient)){
            patientMappingDO = patientMappingDao.findByPatient(patient);
        }
        BasePatientDO patientDO = basePatientDao.findById(patient);
        PatientMedicareCardDO patientMedicareCardDO = patientMedicareCardDao.findByTypeAndPatientCodeAndDel("A_01",patient,"1");
        Integer brxb = 0;
        String brxm = "";
        Date csny =null;
        Integer brnl =0;
        String doctorHis="";
        JSONArray jsonArray = findHisPatient(patientMedicareCardDO.getCode(),demoFlag);
        if(jsonArray!=null&&jsonArray.size()>0){
            //获取居民信息
            JSONObject json = jsonArray.getJSONObject(0);
            brxb = json.getInteger("brxb");
            brxm = json.getString("brxm");
            csny = json.getDate("csny");
            brnl = this.getBrnl(csny);
        }
        //操作医生信息
        JSONArray jsonArray1 = findHisDoctor(doctorMappingDO.getIdcard());
        if(jsonArray1!=null&&jsonArray1.size()>0){
            JSONObject json = jsonArray1.getJSONObject(0);
            doctorHis=json.getString("code");
        }
        // 同一个医生同一个病人，一天一条挂号记录。
        JSONArray ja = fingHlwGhmx(patientMappingDO.getMappingCode(),doctorMappingDO.getMappingCode());
        if (surveys!=null){
            for (YkEmrJcsqDO ykEmrJcsqDO:surveys){
                ykEmrJcsqDO.setJjbc(0);
                ykEmrJcsqDO.setJczt(1);
                ykEmrJcsqDO.setZfpb(0);
                ykEmrJcsqDO.setQxbz(0);
                if (demoFlag){
                    ykEmrJcsqDO.setJjbz(0);
                    ykEmrJcsqDO.setJczt(1);
                    ykEmrJcsqDO.setZfbz(0);
                    ykEmrJcsqDO.setQxbz(0);
                    ykEmrJcsqDO.setBrxb(brxb);
                    ykEmrJcsqDO.setBrxm(brxm);
                    ykEmrJcsqDO.setBrnl(brnl);
                    ykEmrJcsqDO.setKdys(doctorHis);
                }else {
                    ykEmrJcsqDO.setJjbz(0);
                    ykEmrJcsqDO.setJczt(1);
                    ykEmrJcsqDO.setZfbz(0);
                    ykEmrJcsqDO.setQxbz(0);
                    ykEmrJcsqDO.setBrxb(1);
                    ykEmrJcsqDO.setBrxm("测试病人");
                    ykEmrJcsqDO.setBrnl(18);
                    ykEmrJcsqDO.setKdys("测试医生");
                }
            }
            String jsonString = JSONObject.toJSONString(surveys);
            Map<String,Object> params = new HashedMap();
@@ -2356,7 +2411,53 @@ public class YkyyEntranceService {
        }
    }
    /*//查询检查单
    public JSONObject findOrderBy*/
   //查询检查单
   public JSONArray findOrder()throws Exception{
        String sql = "select t.sqdh,t.brid," +
                "t.jzlx,t.brxm,t.brks," +
                "t.brnl,t.kdsj,t.zxks,t.jcxm,t.xmdj," +
             "t.xmdw,t.xmid,t.sqsl from emr_jcsq@ykzxtest t where 1=1";
       Map<String,Object> params = new HashedMap();
       params.put("sql",sql);
       params.put("table","ykEmrJcsqDO");
       logger.info("ykEmrJcsqDO："+sql);
       HttpResponse response = HttpUtils.doGet(jdbcUrl,params);
       String content = response.getContent();
       logger.info("response:"+content);
       JSONObject rs = JSON.parseObject(content);
       Integer status = rs.getInteger("status");
       JSONArray array= new JSONArray();
       if (status==200){
           array = rs.getJSONArray("detailModelList");
       }
       return array;
   }
   public Integer getBrnl(Date date){
       Calendar cal = Calendar.getInstance();
       if (cal.before(date)) {
           throw new IllegalArgumentException(
                   "The birthDay is before Now.It's unbelievable!");
       }
       int yearNow = cal.get(Calendar.YEAR);
       int monthNow = cal.get(Calendar.MONTH) + 1;
       int dayOfMonthNow = cal.get(Calendar.DAY_OF_MONTH);
       cal.setTime(date);
       int yearBirth = cal.get(Calendar.YEAR);
       int monthBirth = cal.get(Calendar.MONTH) + 1;
       int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
       int age = yearNow - yearBirth;
       if (monthNow <= monthBirth) {
           if (monthNow == monthBirth) {
// monthNow==monthBirth
               if (dayOfMonthNow < dayOfMonthBirth) {
                   age--;
               }
           } else {
// monthNow>monthBirth
               age--;
           }
       }
       return age;
   }
}

business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@@ -842,8 +842,8 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
                " t.temp_question_code AS \"tempQuestionCode\", " +
                " t.question_type AS \"questionType\", " +
                " t.temp_option_code AS \"tempOptionCode\", " +
                " t.comment AS \"comment\", " +
                " t.content AS \"content\", " +
                " t.user_comment AS \"comment\", " +
                " t.user_content AS \"content\", " +
                " t.patient AS \"patient\"," +
                " t.patient_name AS \"patientName\"," +
                " t.score AS \"score\"," +
@@ -852,10 +852,10 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
                " wlyy_survey_user_answer t " +
                " WHERE 1=1";
        if(StringUtils.isNotBlank(comment)){
            sql += " AND t.comment like '%"+comment+"%' ";
            sql += " AND t.user_comment like '%"+comment+"%' ";
        }
        if(StringUtils.isNotBlank(content)){
            sql += " AND t.content  like '%"+content+"%'";
            sql += " AND t.user_content  like '%"+content+"%'";
        }
        if(StringUtils.isNotBlank(tempQuestionCode)){
            sql += " AND t.temp_question_code ='"+tempQuestionCode+"'";

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    @GeneratedValue(generator = "generator")
    /*@GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    @Column(name = "id", unique = true, nullable = false)*/
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
//   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/YkEmrJcsqDO.java

@@ -1,5 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
@@ -8,53 +10,57 @@ import java.util.Date;
 *
 * */
//@ApiModel(value = "HlwCf01VO", description = "眼科处方表1数据")
@Entity
@Table(name = "V_EMR_JCSQ")
public class YkEmrJcsqDO {
    private String sqdh;//类似主键递增
    private String brid;//病人id
    private Integer sqdh;//类似主键递增
    private Integer brid;//病人id
    private Integer jzlx;//1默认
    private String jzhm;//门诊号码  病人档案的门诊号码，短信推送该号码给患者，brda查询门诊号码  病人档案的门诊号码，短信推送该号码给患者，brda查询
    private String brxm;//病人姓名
    private String brks;//挂号科室
    private Integer brks;//挂号科室
    private Integer brxb;//1男2女
    private String brnl;//病人年龄
    private Integer brnl;//病人年龄
    private Integer jbbh;//默认0
    private Date kdsj;//取挂号日期
    private String kdys;//开单医生
    private Integer jclx;//默认1
    private Integer jjbc;//默认0
    private Integer jjbz;//默认0
    private Integer jczt;//0新增、1提交、3已执行  我们只管理提交，新增保存在本地
    private Integer zfpb;//0正常  1作废  删除就等于作废
    private Integer zfbz;//0正常  1作废  删除就等于作废
    private Date tjsj;//取挂号日期
    private String tjys;//同上面的kdys
    private String zxks;//执行科室VEMR_ORDER_ITEM zxks
    @Basic
    @Column(name = "BRID")
    public Integer getBrid() {
        return brid;
    }
    public void setBrid(Integer brid) {
        this.brid = brid;
    }
    private Integer zxks;//执行科室VEMR_ORDER_ITEM zxks
    private String jcxm;//项目名称
    private Integer qxbz;//0
    private String yjxh;//关联ms_yj01里面的yjxh
    private Integer yjxh;//关联ms_yj01里面的yjxh
    private Integer xmdj;//项目单价
    private String xmdw;//项目单位
    private String xmid;//项目id  VEMR_ORDER_ITEM_MX
    private Integer xmid;//项目id  VEMR_ORDER_ITEM_MX
    private Integer sqsl;//数量
    private String jzxh;//就诊序号HLWYS_MZ_JZLS的JZXH对应
    private Integer jzxh;//就诊序号HLWYS_MZ_JZLS的JZXH对应
    @Basic
    @Id
    @Column(name = "SQDH")
    public String getSqdh() {
    public Integer getSqdh() {
        return sqdh;
    }
    public void setSqdh(String sqdh) {
    public void setSqdh(Integer sqdh) {
        this.sqdh = sqdh;
    }
    @Basic
    @Column(name = "BRID")
    public String getBrid() {
        return brid;
    }
    public void setBrid(String brid) {
        this.brid = brid;
    }
    @Basic
    @Column(name = "JZLX")
    public Integer getJzlx() {
@@ -84,11 +90,11 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "BRKS")
    public String getBrks() {
    public Integer getBrks() {
        return brks;
    }
    public void setBrks(String brks) {
    public void setBrks(Integer brks) {
        this.brks = brks;
    }
    @Basic
@@ -102,11 +108,11 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "BRNL")
    public String getBrnl() {
    public Integer getBrnl() {
        return brnl;
    }
    public void setBrnl(String brnl) {
    public void setBrnl(Integer brnl) {
        this.brnl = brnl;
    }
    @Basic
@@ -120,6 +126,7 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "KDSJ")
    @JsonFormat(pattern = "dd-mm月-yy", timezone = "GMT+08:00")
    public Date getKdsj() {
        return kdsj;
    }
@@ -146,13 +153,13 @@ public class YkEmrJcsqDO {
        this.jclx = jclx;
    }
    @Basic
    @Column(name = "JJBC")
    public Integer getJjbc() {
        return jjbc;
    @Column(name = "JJBZ")
    public Integer getJjbz() {
        return jjbz;
    }
    public void setJjbc(Integer jjbc) {
        this.jjbc = jjbc;
    public void setJjbz(Integer jjbz) {
        this.jjbz = jjbz;
    }
    @Basic
    @Column(name = "JCZT")
@@ -164,16 +171,17 @@ public class YkEmrJcsqDO {
        this.jczt = jczt;
    }
    @Basic
    @Column(name = "ZFPB")
    public Integer getZfpb() {
        return zfpb;
    @Column(name = "ZFBZ")
    public Integer getZfbz() {
        return zfbz;
    }
    public void setZfpb(Integer zfpb) {
        this.zfpb = zfpb;
    public void setZfbz(Integer zfbz) {
        this.zfbz = zfbz;
    }
    @Basic
    @Column(name = "TJSJ")
    @JsonFormat(pattern = "dd-mm月-yy", timezone = "GMT+08:00")
    public Date getTjsj() {
        return tjsj;
    }
@@ -192,11 +200,11 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "ZXKS")
    public String getZxks() {
    public Integer getZxks() {
        return zxks;
    }
    public void setZxks(String zxks) {
    public void setZxks(Integer zxks) {
        this.zxks = zxks;
    }
    @Basic
@@ -219,11 +227,11 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "YJXH")
    public String getYjxh() {
    public Integer getYjxh() {
        return yjxh;
    }
    public void setYjxh(String yjxh) {
    public void setYjxh(Integer yjxh) {
        this.yjxh = yjxh;
    }
    @Basic
@@ -246,11 +254,11 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "XMID")
    public String getXmid() {
    public Integer getXmid() {
        return xmid;
    }
    public void setXmid(String xmid) {
    public void setXmid(Integer xmid) {
        this.xmid = xmid;
    }
    @Basic
@@ -264,11 +272,11 @@ public class YkEmrJcsqDO {
    }
    @Basic
    @Column(name = "JZXH")
    public String getJzxh() {
    public Integer getJzxh() {
        return jzxh;
    }
    public void setJzxh(String jzxh) {
    public void setJzxh(Integer jzxh) {
        this.jzxh = jzxh;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/YkEmrYzztDO.java

@@ -7,7 +7,8 @@ import javax.persistence.*;
 *
 * */
//@ApiModel(value = "HlwCf01VO", description = "眼科处方表1数据")
@Entity
@Table(name = "emr_yzzt@ykzxtest")
public class YkEmrYzztDO {
    private String ztmc;//	组套名称
    private String ztid;//	关联套组明细字段

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/YkMsYj01DO.java

@@ -1,32 +1,35 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/*
* 检查主表
 */
@Entity
@Table(name = "V_MS_YJ01")
public class YkMsYj01DO {
    private String yjxh;//主键
    private Integer yjxh;//主键
    private Integer MZXH;//0
    private String fphm;//默认空，不为空的时候不能删除或者修改
    private String brid;//病人ID
    private Integer brid;//病人ID
    private String brxm;//病人姓名
    private Date kdrq;//取挂号日期
    private String ksdm;//医生科室
    private Integer ksdm;//医生科室
    private String ysdm;//VEMR_USER.ygdm 医生表中的员工代码
    private String zxks;//	执行科室VEMR_ORDER_ITEM zxks
    private Integer zxks;//	执行科室VEMR_ORDER_ITEM zxks
    private Integer zxpb;//执行判别 默认0
    private Integer zfpb;//	作废判别  0正常  1作废
    private Integer Cfbz;//	默认0
    private String jzxh;//	就诊序号HLWYS_MZ_JZLS的JZXH对应
    private Integer jzxh;//	就诊序号HLWYS_MZ_JZLS的JZXH对应
    private Integer djzt;//默认0
    private String sqid;//去emr_jcsq里面sqdh
    private Integer sqid;//去emr_jcsq里面sqdh
    private Integer qxbz;//取消标准  默认0
    private String xmmc;//项目名称
    private String ztbh;//项目id  VEMR_ORDER_ITEM_MX
    private Integer ztbh;//项目id  VEMR_ORDER_ITEM_MX
    private Integer ygsf;//默认0
    private Integer jcbw;//默认0
    private Integer zjflag;//默认1
@@ -34,11 +37,11 @@ public class YkMsYj01DO {
    @Basic
    @Id
    @Column(name = "YJXH")
    public String getYjxh() {
    public Integer getYjxh() {
        return yjxh;
    }
    public void setYjxh(String yjxh) {
    public void setYjxh(Integer yjxh) {
        this.yjxh = yjxh;
    }
    @Basic
@@ -61,15 +64,15 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "BRID")
    public String getBrid() {
    public Integer getBrid() {
        return brid;
    }
    public void setBrid(String brid) {
    public void setBrid(Integer brid) {
        this.brid = brid;
    }
    @Basic
    @Column(name = "BRID")
    @Column(name = "BRXM")
    public String getBrxm() {
        return brxm;
    }
@@ -79,6 +82,7 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "KDRQ")
    @JsonFormat(pattern = "dd-mm月-yy", timezone = "GMT+08:00")
    public Date getKdrq() {
        return kdrq;
    }
@@ -88,11 +92,11 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "KSDM")
    public String getKsdm() {
    public Integer getKsdm() {
        return ksdm;
    }
    public void setKsdm(String ksdm) {
    public void setKsdm(Integer ksdm) {
        this.ksdm = ksdm;
    }
    @Basic
@@ -106,11 +110,11 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "ZXKS")
    public String getZxks() {
    public Integer getZxks() {
        return zxks;
    }
    public void setZxks(String zxks) {
    public void setZxks(Integer zxks) {
        this.zxks = zxks;
    }
    @Basic
@@ -142,11 +146,11 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "JZXH")
    public String getJzxh() {
    public Integer getJzxh() {
        return jzxh;
    }
    public void setJzxh(String jzxh) {
    public void setJzxh(Integer jzxh) {
        this.jzxh = jzxh;
    }
    @Basic
@@ -160,11 +164,11 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "SQID")
    public String getSqid() {
    public Integer getSqid() {
        return sqid;
    }
    public void setSqid(String sqid) {
    public void setSqid(Integer sqid) {
        this.sqid = sqid;
    }
    @Basic
@@ -187,11 +191,11 @@ public class YkMsYj01DO {
    }
    @Basic
    @Column(name = "ZTBH")
    public String getZtbh() {
    public Integer getZtbh() {
        return ztbh;
    }
    public void setZtbh(String ztbh) {
    public void setZtbh(Integer ztbh) {
        this.ztbh = ztbh;
    }
    @Basic

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/YkMsYj02DO.java

@@ -6,55 +6,56 @@ import javax.persistence.criteria.From;
/*
 * 检查明细
 */
@Entity
@Table(name = "V_MS_YJ02")
public class YkMsYj02DO {
    private String sbxh;//id
    private String yjxh ;//Ms_yi01里的yjxh
    private String ylxh;//组套明细里关联VEMR_ORDER_ITEM 里面  ITEM_CODE
    private String xmlx;//SELECT XMLX  javax.persistence.criteria.From GY_YLSF Where FYXH =l l_fyxh   查询后结果写入
    private Integer sbxh;//id
    private Integer yjxh ;//Ms_yi01里的yjxh
    private Integer ylxh;//组套明细里关联VEMR_ORDER_ITEM 里面  ITEM_CODE
    private Integer xmlx;//SELECT XMLX  javax.persistence.criteria.From GY_YLSF Where FYXH =l l_fyxh   查询后结果写入
    private Integer yjxz;//明细第一条是1，其它是0
    private Integer Yldj;//单价  select * from  portal_his.gy_ylsf@YKZXTEST where fyxh = l l_fyxh
    private Integer ylsl;//数量 = 取项目明细 * 医生填的数量  参考截图   fysl
    private Integer hjje;//	合计金额
    private String  fygb;//SELECT fygb From GY_YLSF Where FYXH =l l_fyxh  查询后结果写入
    private Integer fygb;//SELECT fygb From GY_YLSF Where FYXH =l l_fyxh  查询后结果写入
    private Integer zfbl;//	默认1
    private Integer zxpb;//默认0
    private Integer zjflag;//	默认0
    @Basic
    @Id
    @Column(name = "SBXH")
    public String getSbxh() {
    public Integer getSbxh() {
        return sbxh;
    }
    public void setSbxh(String sbxh) {
    public void setSbxh(Integer sbxh) {
        this.sbxh = sbxh;
    }
    @Basic
    @Column(name = "YJXH")
    public String getYjxh() {
    public Integer getYjxh() {
        return yjxh;
    }
    public void setYjxh(String yjxh) {
    public void setYjxh(Integer yjxh) {
        this.yjxh = yjxh;
    }
    @Basic
    @Column(name = "YLX")
    public String getYlxh() {
    public Integer getYlxh() {
        return ylxh;
    }
    public void setYlxh(String ylx) {
    public void setYlxh(Integer ylx) {
        this.ylxh = ylxh;
    }
    @Basic
    @Column(name = "XMLX")
    public String getXmlx() {
    public Integer getXmlx() {
        return xmlx;
    }
    public void setXmlx(String xmlx) {
    public void setXmlx(Integer xmlx) {
        this.xmlx = xmlx;
    }
    @Basic
@@ -95,11 +96,11 @@ public class YkMsYj02DO {
    }
    @Basic
    @Column(name = "FYGB")
    public String getFygb() {
    public Integer getFygb() {
        return fygb;
    }
    public void setFygb(String fygb) {
    public void setFygb(Integer fygb) {
        this.fygb = fygb;
    }
    @Basic

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyUserAnswerDO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.hospital.survey;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -65,7 +66,7 @@ public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    public void setTempOptionCode(String tempOptionCode) {
        this.tempOptionCode = tempOptionCode;
    }
    @Column(name = "user_content")
    public String getContent() {
        return content;
    }
@@ -106,7 +107,7 @@ public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "user_comment")
    public String getComment() {
        return comment;
    }

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

@@ -1025,6 +1025,10 @@ public class BaseHospitalRequestMapping {
        public static final String doctorReplyUpdateYktState = "doctorReplyUpdateYktState";
        public static final String outPatientOrder = "/outPatientOrder";
        public static final String findYzztByGslb = "/findYzztByGslb";
        public static final String findZtmxByid = "/findZtmxByid";
        public static final String findZlxm = "/findZlxm";
        public static final String findZlxmMx = "/findZlxmMx";
    }

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/YkyyController.java

@@ -261,11 +261,11 @@ public class YkyyController extends EnvelopRestEndpoint {
                    String updatesqdh = "update portal_his.gy_identity_ms@ykzxtest set dqz=dqz+1 where bmc = 'EMR_JCSQ'";
                    hibenateUtils.updateBySql(updatesqdh);
                }
                ykEmrJcsqDO.setSqdh(sqdh.toString());
                ykEmrJcsqDO.setSqdh(sqdh.intValue());
                ykEmrJcsqDO.setJclx(1);
                ykEmrJcsqDO.setJjbc(0);
                ykEmrJcsqDO.setJjbz(0);
                ykEmrJcsqDO.setJczt(1);
                ykEmrJcsqDO.setZfpb(0);
                ykEmrJcsqDO.setZfbz(0);
                ykEmrJcsqDO.setQxbz(0);
                totalprice +=ykEmrJcsqDO.getXmdj()*ykEmrJcsqDO.getSqsl();
                System.out.println("totalprice"+totalprice);
@@ -277,25 +277,25 @@ public class YkyyController extends EnvelopRestEndpoint {
                    System.out.println("yjxh:"+yjxh);
                    String updateyjxh = "update portal_his.gy_identity_ms@ykzxtest set dqz=dqz+1 where bmc = 'MS_YJ01'";
                    hibenateUtils.updateBySql(updateyjxh);
                    ykEmrJcsqDO.setYjxh(yjxh.toString());
                    ykEmrJcsqDO.setYjxh(yjxh.intValue());
                }
                ykyyEntranceService.save(ykEmrJcsqDO);
                YkMsYj01DO ykMsYj01DO = new YkMsYj01DO();
                ykMsYj01DO.setYjxh(yjxh.toString());
                ykMsYj01DO.setYjxh(yjxh.intValue());
                ykMsYj01DO.setMZXH(0);
                ykMsYj01DO.setFphm("");
                ykMsYj01DO.setBrid(ykEmrJcsqDO.getBrid());
                ykMsYj01DO.setBrxm(ykEmrJcsqDO.getBrxm());
                ykMsYj01DO.setKdrq(ykEmrJcsqDO.getKdsj());
                ykMsYj01DO.setKsdm("医生科室");
                ykMsYj01DO.setYsdm("VEMR_USER.ygdm 医生表中的员工代码");
                ykMsYj01DO.setKsdm(ykEmrJcsqDO.getBrks());
                ykMsYj01DO.setYsdm(ykEmrJcsqDO.getKdys());
                ykMsYj01DO.setZxks(ykEmrJcsqDO.getZxks());
                ykMsYj01DO.setZxpb(0);
                ykMsYj01DO.setZfpb(0);
                ykMsYj01DO.setCfbz(0);
                ykMsYj01DO.setJzxh("就诊序号");
                ykMsYj01DO.setJzxh(ykEmrJcsqDO.getJzxh());
                ykMsYj01DO.setDjzt(0);
                ykMsYj01DO.setSqid(sqdh.toString());
                ykMsYj01DO.setSqid(sqdh.intValue());
                ykMsYj01DO.setQxbz(0);
                ykMsYj01DO.setXmmc(ykEmrJcsqDO.getJcxm());
                ykMsYj01DO.setZtbh(ykEmrJcsqDO.getXmid());
@@ -320,7 +320,7 @@ public class YkyyController extends EnvelopRestEndpoint {
                            hibenateUtils.updateBySql(updateyjxh);
                        }
                        YkMsYj02DO ykMsYj02DO = new YkMsYj02DO();
                        ykMsYj02DO.setSbxh(sbxh.toString());
                        ykMsYj02DO.setSbxh(sbxh.intValue());
                        ykMsYj02DO.setYjxh(ykMsYj01DO.getYjxh());
                        ykMsYj02DO.setYlxh(ykEmrJcsqDO.getXmid());
                        Integer sqsl = ykEmrJcsqDO.getSqsl();
@@ -333,8 +333,8 @@ public class YkyyController extends EnvelopRestEndpoint {
                        List<Map<String,Object>> fyxhList = hibenateUtils.createSQLQuery(fyxhSql);
                        if (fyxhList.size()>0){
                            ykMsYj02DO.setXmlx(fyxhList.get(0).get("XMLX").toString());
                            ykMsYj02DO.setFygb(fyxhList.get(0).get("fygb").toString());
                            ykMsYj02DO.setXmlx(Integer.valueOf(fyxhList.get(0).get("XMLX").toString()));
                            ykMsYj02DO.setFygb(Integer.valueOf(fyxhList.get(0).get("fygb").toString()));
                            ykMsYj02DO.setYldj(Integer.valueOf(fyxhList.get(0).get("fydj").toString()));
                            ykMsYj02DO.setHjje(ykMsYj02DO.getYldj()*ykMsYj02DO.getYlsl());
                        }

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

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.consult;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
@@ -932,11 +933,55 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.outPatientOrder)
	@ApiOperation(value = "线上开检查单", notes = "线上开具检查单")
	public ObjEnvelop ykOlineOrder(@ApiParam(name = "jsondata", value = "jsondata")
												@RequestParam(value = "jsondata", required = true)String jsondata)throws Exception {
												@RequestParam(value = "jsondata", required = true)String jsondata,
								   @ApiParam(name = "doctor", value = "doctor")
								   @RequestParam(value = "doctor", required = true)String doctor,
								   @ApiParam(name = "patient", value = "patient")
									   @RequestParam(value = "patient", required = true)String patient)throws Exception {
		String success= ykyyEntranceService.outPatientOrder(jsondata);
		String success= ykyyEntranceService.outPatientOrder(jsondata,false,doctor,patient);
		ObjEnvelop objEnvelop = new ObjEnvelop();
		objEnvelop.setObj(success);
		return objEnvelop;
	}
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.findYzztByGslb)
	@ApiOperation(value = "组套项目查询", notes = "组套项目查询")
	public ObjEnvelop findYzztByGslb(@ApiParam(name = "gslb", value = "gslb")
								   @RequestParam(value = "gslb", required = false)String gslb)throws Exception {
		JSONArray array= ykyyEntranceService.findYzztByGslb(gslb);
		ObjEnvelop objEnvelop = new ObjEnvelop();
		objEnvelop.setObj(array);
		return objEnvelop;
	}
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.findZtmxByid)
	@ApiOperation(value = "组套项目明细查询", notes = "组套项目明细查询")
	public ObjEnvelop findZtmxByid(@ApiParam(name = "ztId", value = "ztId")
									 @RequestParam(value = "ztId", required = true)String ztId)throws Exception {
		JSONArray array= ykyyEntranceService.findZtmxByid(ztId);
		ObjEnvelop objEnvelop = new ObjEnvelop();
		objEnvelop.setObj(array);
		return objEnvelop;
	}
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.findZlxm)
	@ApiOperation(value = "诊疗项目查询", notes = "诊疗项目查询")
	public ObjEnvelop findZlxm(@ApiParam(name = "itemName", value = "itemName")
								   @RequestParam(value = "itemName", required = false)String itemName)throws Exception {
		JSONArray array= ykyyEntranceService.findZlxm(itemName);
		ObjEnvelop objEnvelop = new ObjEnvelop();
		objEnvelop.setObj(array);
		return objEnvelop;
	}
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.findZlxmMx)
	@ApiOperation(value = "诊疗项目明细查询", notes = "诊疗项目明细查询")
	public ObjEnvelop findZlxmMx(@ApiParam(name = "zlxmId", value = "zlxmId")
							   @RequestParam(value = "zlxmId", required = true)String zlxmId)throws Exception {
		JSONArray array= ykyyEntranceService.findZlxmMx(zlxmId);
		ObjEnvelop objEnvelop = new ObjEnvelop();
		objEnvelop.setObj(array);
		return objEnvelop;
	}
}

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

@@ -39,6 +39,7 @@ public class BaseUserMsgController extends EnvelopRestEndpoint {
                                   @ApiParam(name = "isDoctor", value = "isDoctor", required = false)
                                       @RequestParam(value = "isDoctor", required = false)Integer  isDoctor){
        String patient = getUID();
        System.out.println("patient"+patient);
        baseUserMsgService.responseMessage(contentId,content,reciverId,patient,isDoctor);
        return success("回复成功" );
    }
@@ -54,6 +55,7 @@ public class BaseUserMsgController extends EnvelopRestEndpoint {
                                    @RequestParam(value = "type", required = false)Integer type
                              ){
        String senderId = getUID();
        System.out.println("senderId"+senderId);
        //String senderName = getUNAME();
        baseUserMsgService.leaveMessage(content,reciverId,reciverName,senderId,type);
        return success("留言成功" );