医嘱模板问题

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -1231,7 +1231,7 @@ public interface YiZhuLuRuDao {
             "INSERT INTO yz_pattern_order (act_order_no, order_code, frequ_code, drug_flag, supply_code, drug_quan, instruction, " +
             "                              drug_specification, mini_unit, drug_weight, drug_weight_unit, parent_no, drug_volume, " +
             "                              drug_vol_unit, dose, dose_unit, drug_occ,  order_name, discription, " +
-            "                              pattern_code, serial, self_buy, exec_unit) " +
+            "                              pattern_code, serial, self_buy, exec_unit,group_no) " +
             "VALUES " +
             "<foreach collection='list' item='item' separator=','>" +
             "(#{item.actOrderNo}, #{item.orderCode}, #{item.frequCode}," +
@@ -1282,7 +1282,7 @@ public interface YiZhuLuRuDao {
             "<if test=\"item.drugOcc == null \">" +
             "null," +
             "</if>" +
-            " #{item.orderName},#{item.discription},#{patternCode},#{item.serial},#{item.selfBuy},#{item.execUnit})" +
+            " #{item.orderName},#{item.discription},#{patternCode},#{item.serial},#{item.selfBuy},#{item.execUnit},#{item.groupNo})" +
             "</foreach>" +
             "</script>")
     void chaRuMuBanShuJu(List<XinZhenYzActOrder> list, String patternCode);

src/main/java/thyyxxk/webserver/entity/datamodify/YzTemperature.java

@@ -1,750 +1,771 @@
 package thyyxxk.webserver.entity.datamodify;
 
 import java.io.Serializable;
+
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-public class YzTemperature  implements Serializable {
-
-	private static final long serialVersionUID =  8042518365378175786L;
-
-	/**
-	 * inpatientNo
-	 */
-	private String inpatientNo;
-
-	/**
-	 * 患者姓名
-	 * */
-	private String patientName;
-
-	/**
-	 * admissTimes
-	 */
-	private Integer admissTimes;
-
-	/**
-	 * 获取前端的日期，然后在拆分出来
-	 * */
-	private Date date;
-
-	private Date tempDate;
-	/**
-	 * recDate
-	 */
-	private Date recDate;
-
-	/**
-	 * recTime
-	 */
-	private Date recTime;
-
-	private String toStringRecDate;
-	private String toStringRecTime;
-
-	private String splicingOtherInfo;
-
-	/**
-	 * detailNo
-	 */
-	private Integer detailNo;
-
-	/**
-	 * patientState
-	 */
-	private String patientState;
-
-	/**
-	 * temperature
-	 */
-	private BigDecimal temperature;
-
-	/**
-	 * temperatureType
-	 */
-	private String temperatureType;
-
-	/**
-	 * pulse
-	 */
-	private BigDecimal pulse;
-
-	/**
-	 * breathe
-	 */
-	private Integer breathe;
-
-	/**
-	 * pressureAm
-	 */
-	private String pressureAm;
-
-	/**
-	 * pressurePm
-	 */
-	private String pressurePm;
-
-	/**
-	 * spo2
-	 */
-	private Double spo2;
-
-	/**
-	 * mind
-	 */
-	private String mind;
-
-	/**
-	 * lpupil
-	 */
-	private BigDecimal lpupil;
-
-	/**
-	 * rpupil
-	 */
-	private BigDecimal rpupil;
-
-	/**
-	 * pupil
-	 */
-	private String pupil;
-
-	/**
-	 * colName
-	 */
-	private String colName;
-
-	/**
-	 * intake
-	 */
-	private BigDecimal intake;
-
-	/**
-	 * shit
-	 */
-	private BigDecimal shit;
-
-	/**
-	 * shitOther
-	 */
-	private String shitOther;
-
-	/**
-	 * shitUnit
-	 */
-	private String shitUnit;
-
-	/**
-	 * shitShape
-	 */
-	private String shitShape;
-
-	/**
-	 * urineQuanAm
-	 */
-	private BigDecimal urineQuanAm;
-
-	/**
-	 * bodyWeight
-	 */
-	private String bodyWeight;
-
-	/**
-	 * bodyWeightInfo
-	 */
-	private String bodyWeightInfo;
-
-	/**
-	 * blood
-	 */
-	private BigDecimal blood;
-
-	/**
-	 * bodyFluid
-	 */
-	private BigDecimal bodyFluid;
-
-	/**
-	 * outputSum
-	 */
-	private BigDecimal outputSum;
-
-	/**
-	 * outputOther
-	 */
-	private BigDecimal outputOther;
-
-	/**
-	 * decubitus
-	 */
-	private String decubitus;
-
-	/**
-	 * skin
-	 */
-	private String skin;
-
-	/**
-	 * sputumFlag
-	 */
-	private Integer sputumFlag;
-
-	/**
-	 * atomizationFlag
-	 */
-	private Integer atomizationFlag;
-
-	/**
-	 * mouthpieceFlag
-	 */
-	private Integer mouthpieceFlag;
-
-	/**
-	 * eyesFlag
-	 */
-	private Integer eyesFlag;
-
-	/**
-	 * otherInfo
-	 */
-	private String otherInfo;
-
-	/**
-	 * userid
-	 */
-	private String userid;
-
-	/**
-	 * inputTime
-	 */
-	private Date inputTime;
-
-	/**
-	 * physicalFlag
-	 */
-	private Integer physicalFlag;
-
-	/**
-	 * skinFlag
-	 */
-	private Integer skinFlag;
-
-	/**
-	 * modifyUserid
-	 */
-	private String modifyUserid;
-
-	/**
-	 * modifyTime
-	 */
-	private Date modifyTime;
-
-	/**
-	 * sumFlag
-	 */
-	private Integer sumFlag;
-
-	/**
-	 * urineQuanInfo
-	 */
-	private BigDecimal urineQuanInfo;
-
-	/**
-	 * scdFlag
-	 */
-	private Integer scdFlag;
-
-	/**
-	 * roomTemperature
-	 */
-	private BigDecimal roomTemperature;
-
-	/**
-	 * humidness
-	 */
-	private BigDecimal humidness;
-
-	/**
-	 * intakeSpeed
-	 */
-	private BigDecimal intakeSpeed;
-
-	/**
-	 * intakeBreastMilk
-	 */
-	private BigDecimal intakeBreastMilk;
-
-	/**
-	 * intakeWater
-	 */
-	private BigDecimal intakeWater;
-
-	/**
-	 * intakeMilk
-	 */
-	private BigDecimal intakeMilk;
-
-	/**
-	 * urineQuanColor
-	 */
-	private String urineQuanColor;
-
-	/**
-	 * shitWater
-	 */
-	private BigDecimal shitWater;
-
-	/**
-	 * outputOtherInfo
-	 */
-	private String outputOtherInfo;
-
-	/**
-	 * bellybuttonFlag
-	 */
-	private Integer bellybuttonFlag;
-
-	/**
-	 * buttocksFlag
-	 */
-	private Integer buttocksFlag;
-
-	/**
-	 * showerFlag
-	 */
-	private Integer showerFlag;
-
-	/**
-	 * spongeBathFlag
-	 */
-	private Integer spongeBathFlag;
-
-	/**
-	 * infoCry
-	 */
-	private String infoCry;
-
-	/**
-	 * infoSuck
-	 */
-	private String infoSuck;
-
-	/**
-	 * infoSleep
-	 */
-	private String infoSleep;
-
-	/**
-	 * infoActivity
-	 */
-	private String infoActivity;
-
-	/**
-	 * acraTemperature
-	 */
-	private String acraTemperature;
-
-	/**
-	 * scdSpecialtext
-	 */
-	private String scdSpecialtext;
-
-	/**
-	 * tableStyle
-	 */
-	private Integer tableStyle;
-
-	/**
-	 * physicalMethodFlag
-	 */
-	private String physicalMethodFlag;
-
-	/**
-	 * bodyStature
-	 */
-	private BigDecimal bodyStature;
-
-	/**
-	 * heart
-	 */
-	private Integer heart;
-
-	/**
-	 * specialtextTime
-	 */
-	private Date specialtextTime;
-
-	/**
-	 * specialtextOther
-	 */
-	private String specialtextOther;
-
-	/**
-	 * temperatureCool
-	 */
-	private BigDecimal temperatureCool;
-
-	/**
-	 * temperature1
-	 */
-	private BigDecimal temperature1;
-
-	/**
-	 * pulse1
-	 */
-	private BigDecimal pulse1;
-
-	/**
-	 * breathe1
-	 */
-	private Integer breathe1;
-
-	/**
-	 * pressure1Am
-	 */
-	private BigDecimal pressure1Am;
-
-	/**
-	 * pressure1Pm
-	 */
-	private BigDecimal pressure1Pm;
-
-	/**
-	 * col1Name
-	 */
-	private String col1Name;
-
-	/**
-	 * col1Am
-	 */
-	private BigDecimal col1Am;
-
-	/**
-	 * isSputum
-	 */
-	private Integer isSputum;
-
-	/**
-	 * isAtomization
-	 */
-	private Integer isAtomization;
-
-	/**
-	 * isMouthpiece
-	 */
-	private Integer isMouthpiece;
-
-	/**
-	 * isEyes
-	 */
-	private Integer isEyes;
-
-	/**
-	 * isPhysical
-	 */
-	private Integer isPhysical;
-
-	/**
-	 * isSkin
-	 */
-	private Integer isSkin;
-
-	/**
-	 * temperature1Type
-	 */
-	private String temperature1Type;
-
-	/**
-	 * isPhysicalMethod
-	 */
-	private Integer isPhysicalMethod;
-
-	/**
-	 * tubesName
-	 */
-	private String tubesName;
-
-	/**
-	 * isTubes
-	 */
-	private Integer isTubes;
-
-	/**
-	 * col2Name
-	 */
-	private String col2Name;
-
-	/**
-	 * col2Am
-	 */
-	private BigDecimal col2Am;
-
-	/**
-	 * tubesStatus
-	 */
-	private String tubesStatus;
-
-	/**
-	 * boxTemp
-	 */
-	private BigDecimal boxTemp;
-
-	/**
-	 * boxHumi
-	 */
-	private BigDecimal boxHumi;
-
-	/**
-	 * urineColor
-	 */
-	private String urineColor;
-
-	/**
-	 * shitQuan
-	 */
-	private BigDecimal shitQuan;
-
-	/**
-	 * shitWaterQuan
-	 */
-	private BigDecimal shitWaterQuan;
-
-	/**
-	 * outputDblood
-	 */
-	private BigDecimal outputDblood;
-
-	/**
-	 * fHeartSound
-	 */
-	private String fHeartSound;
-
-	/**
-	 * fetalBreak
-	 */
-	private String fetalBreak;
-
-	/**
-	 * uterineOpen
-	 */
-	private String uterineOpen;
-
-	/**
-	 * uterineStatus
-	 */
-	private String uterineStatus;
-
-	/**
-	 * uterineHigh
-	 */
-	private String uterineHigh;
-
-	/**
-	 * uterineMove
-	 */
-	private String uterineMove;
-
-	/**
-	 * outBlood
-	 */
-	private String outBlood;
-
-	/**
-	 * redHurt
-	 */
-	private String redHurt;
-
-	/**
-	 * anusAir
-	 */
-	private String anusAir;
-
-	/**
-	 * suckleFun
-	 */
-	private String suckleFun;
-
-	/**
-	 * faceColour
-	 */
-	private String faceColour;
-
-	/**
-	 * skinColour
-	 */
-	private String skinColour;
-
-	/**
-	 * skinStatus
-	 */
-	private String skinStatus;
-
-	/**
-	 * urineQuan
-	 */
-	private Integer urineQuan;
-
-	/**
-	 * boxTempIn
-	 */
-	private BigDecimal boxTempIn;
-
-	/**
-	 * boxTempOut
-	 */
-	private BigDecimal boxTempOut;
-
-	/**
-	 * breath
-	 */
-	private String breath;
-
-	/**
-	 * acraStatus
-	 */
-	private String acraStatus;
-
-	/**
-	 * intakeFlag
-	 */
-	private String intakeFlag;
-
-	/**
-	 * outtakeFlag
-	 */
-	private String outtakeFlag;
-
-	/**
-	 * urineInfo
-	 */
-	private String urineInfo;
-
-	/**
-	 * intakeInfo
-	 */
-	private String intakeInfo;
-
-	/**
-	 * outputInfo
-	 */
-	private String outputInfo;
-
-	/**
-	 * pupilr
-	 */
-	private String pupilr;
-
-	/**
-	 * pupilbj
-	 */
-	private String pupilbj;
-
-	/**
-	 * fmTime
-	 */
-	private Date fmTime;
-
-	/**
-	 * csTime
-	 */
-	private Date csTime;
-
-	/**
-	 * fHeartSoundStr
-	 */
-	private String fHeartSoundStr;
-
-	/**
-	 * glu
-	 */
-	private String glu;
-
-	/**
-	 * painLvl
-	 */
-	private String painLvl;
-
-	/**
-	 * breatheMachine
-	 */
-	private String breatheMachine;
-
-	/**
-	 * map
-	 */
-	private Integer map;
-
-	/**
-	 * col1Srl
-	 */
-	private String col1Srl;
-
-	/**
-	 * gastric
-	 */
-	private String gastric;
-
-	/**
-	 * cvp
-	 */
-	private String cvp;
-
-	/**
-	 * etcho2
-	 */
-	private String etcho2;
-
-	/**
-	 * gcs
-	 */
-	private String gcs;
-
-	/**
-	 * rass
-	 */
-	private String rass;
-
-	/**
-	 * othJc
-	 */
-	private String othJc;
-
-	/**
-	 * position
-	 */
-	private String position;
-
-	/**
-	 * isBreath
-	 */
-	private Integer isBreath;
-
-	/**
-	 * isHuiyin
-	 */
-	private Integer isHuiyin;
-
-	/**
-	 * isBed
-	 */
-	private Integer isBed;
-
-	/**
-	 * isAV
-	 */
-	private Integer isAV;
-
-	/**
-	 * col1Dos
-	 */
-	private String col1Dos;
-
-	/**
-	 * ward
-	 */
-	private String ward;
+public class YzTemperature implements Serializable {
+
+    private static final long serialVersionUID = 8042518365378175786L;
+
+    /**
+     * inpatientNo
+     */
+    private String inpatientNo;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * admissTimes
+     */
+    private Integer admissTimes;
+
+    /**
+     * 获取前端的日期，然后在拆分出来
+     */
+    private Date date;
+
+    private Date tempDate;
+    /**
+     * recDate
+     */
+    private Date recDate;
+
+    /**
+     * recTime
+     */
+    private Date recTime;
+
+    private String recDateStr;
+    private String recTimeStr;
+
+    private String toStringRecDate;
+    private String toStringRecTime;
+
+    private String splicingOtherInfo;
+
+    /**
+     * detailNo
+     */
+    private Integer detailNo;
+
+    /**
+     * patientState
+     */
+    private String patientState;
+
+    /**
+     * temperature
+     */
+    private BigDecimal temperature;
+
+    /**
+     * temperatureType
+     */
+    private String temperatureType;
+
+    /**
+     * pulse
+     */
+    private BigDecimal pulse;
+
+    /**
+     * breathe
+     */
+    private Integer breathe;
+
+    /**
+     * pressureAm
+     */
+    private String pressureAm;
+
+    /**
+     * pressurePm
+     */
+    private String pressurePm;
+
+    /**
+     * spo2
+     */
+    private Double spo2;
+
+    /**
+     * mind
+     */
+    private String mind;
+
+    /**
+     * lpupil
+     */
+    private BigDecimal lpupil;
+
+    /**
+     * rpupil
+     */
+    private BigDecimal rpupil;
+
+    /**
+     * pupil
+     */
+    private String pupil;
+
+    /**
+     * colName
+     */
+    private String colName;
+
+    /**
+     * intake
+     */
+    private BigDecimal intake;
+
+    /**
+     * shit
+     */
+    private BigDecimal shit;
+
+    /**
+     * shitOther
+     */
+    private String shitOther;
+
+    /**
+     * shitUnit
+     */
+    private String shitUnit;
+
+    /**
+     * shitShape
+     */
+    private String shitShape;
+
+    /**
+     * urineQuanAm
+     */
+    private BigDecimal urineQuanAm;
+
+    /**
+     * bodyWeight
+     */
+    private String bodyWeight;
+
+    /**
+     * bodyWeightInfo
+     */
+    private String bodyWeightInfo;
+
+    /**
+     * blood
+     */
+    private BigDecimal blood;
+
+    /**
+     * bodyFluid
+     */
+    private BigDecimal bodyFluid;
+
+    /**
+     * outputSum
+     */
+    private BigDecimal outputSum;
+
+    /**
+     * outputOther
+     */
+    private BigDecimal outputOther;
+
+    /**
+     * decubitus
+     */
+    private String decubitus;
+
+    /**
+     * skin
+     */
+    private String skin;
+
+    /**
+     * sputumFlag
+     */
+    private Integer sputumFlag;
+
+    /**
+     * atomizationFlag
+     */
+    private Integer atomizationFlag;
+
+    /**
+     * mouthpieceFlag
+     */
+    private Integer mouthpieceFlag;
+
+    /**
+     * eyesFlag
+     */
+    private Integer eyesFlag;
+
+    /**
+     * otherInfo
+     */
+    private String otherInfo;
+
+    /**
+     * userid
+     */
+    private String userid;
+
+    /**
+     * inputTime
+     */
+    private Date inputTime;
+
+    /**
+     * physicalFlag
+     */
+    private Integer physicalFlag;
+
+    /**
+     * skinFlag
+     */
+    private Integer skinFlag;
+
+    /**
+     * modifyUserid
+     */
+    private String modifyUserid;
+
+    /**
+     * modifyTime
+     */
+    private Date modifyTime;
+
+    /**
+     * sumFlag
+     */
+    private Integer sumFlag;
+
+    /**
+     * urineQuanInfo
+     */
+    private BigDecimal urineQuanInfo;
+
+    /**
+     * scdFlag
+     */
+    private Integer scdFlag;
+
+    /**
+     * roomTemperature
+     */
+    private BigDecimal roomTemperature;
+
+    /**
+     * humidness
+     */
+    private BigDecimal humidness;
+
+    /**
+     * intakeSpeed
+     */
+    private BigDecimal intakeSpeed;
+
+    /**
+     * intakeBreastMilk
+     */
+    private BigDecimal intakeBreastMilk;
+
+    /**
+     * intakeWater
+     */
+    private BigDecimal intakeWater;
+
+    /**
+     * intakeMilk
+     */
+    private BigDecimal intakeMilk;
+
+    /**
+     * urineQuanColor
+     */
+    private String urineQuanColor;
+
+    /**
+     * shitWater
+     */
+    private BigDecimal shitWater;
+
+    /**
+     * outputOtherInfo
+     */
+    private String outputOtherInfo;
+
+    /**
+     * bellybuttonFlag
+     */
+    private Integer bellybuttonFlag;
+
+    /**
+     * buttocksFlag
+     */
+    private Integer buttocksFlag;
+
+    /**
+     * showerFlag
+     */
+    private Integer showerFlag;
+
+    /**
+     * spongeBathFlag
+     */
+    private Integer spongeBathFlag;
+
+    /**
+     * infoCry
+     */
+    private String infoCry;
+
+    /**
+     * infoSuck
+     */
+    private String infoSuck;
+
+    /**
+     * infoSleep
+     */
+    private String infoSleep;
+
+    /**
+     * infoActivity
+     */
+    private String infoActivity;
+
+    /**
+     * acraTemperature
+     */
+    private String acraTemperature;
+
+    /**
+     * scdSpecialtext
+     */
+    private String scdSpecialtext;
+
+    /**
+     * tableStyle
+     */
+    private Integer tableStyle;
+
+    /**
+     * physicalMethodFlag
+     */
+    private String physicalMethodFlag;
+
+    /**
+     * bodyStature
+     */
+    private BigDecimal bodyStature;
+
+    /**
+     * heart
+     */
+    private Integer heart;
+
+    /**
+     * specialtextTime
+     */
+    private Date specialtextTime;
+
+    /**
+     * specialtextOther
+     */
+    private String specialtextOther;
+
+    /**
+     * temperatureCool
+     */
+    private BigDecimal temperatureCool;
+
+    /**
+     * temperature1
+     */
+    private BigDecimal temperature1;
+
+    /**
+     * pulse1
+     */
+    private BigDecimal pulse1;
+
+    /**
+     * breathe1
+     */
+    private Integer breathe1;
+
+    /**
+     * pressure1Am
+     */
+    private BigDecimal pressure1Am;
+
+    /**
+     * pressure1Pm
+     */
+    private BigDecimal pressure1Pm;
+
+    public String getPressure1AmAndPm() {
+        String a = "";
+        String b = "";
+        if (pressure1Am != null) {
+            a = pressure1Am.stripTrailingZeros().toPlainString();
+        }
+        if (pressure1Pm != null) {
+            b = pressure1Pm.stripTrailingZeros().toPlainString();
+        }
+        if (pressure1Pm == null && pressure1Am == null) {
+            return "";
+        } else {
+            return a + "/" + b;
+        }
+
+    }
+
+    /**
+     * col1Name
+     */
+    private String col1Name;
+
+    /**
+     * col1Am
+     */
+    private BigDecimal col1Am;
+
+    /**
+     * isSputum
+     */
+    private Integer isSputum;
+
+    /**
+     * isAtomization
+     */
+    private Integer isAtomization;
+
+    /**
+     * isMouthpiece
+     */
+    private Integer isMouthpiece;
+
+    /**
+     * isEyes
+     */
+    private Integer isEyes;
+
+    /**
+     * isPhysical
+     */
+    private Integer isPhysical;
+
+    /**
+     * isSkin
+     */
+    private Integer isSkin;
+
+    /**
+     * temperature1Type
+     */
+    private String temperature1Type;
+
+    /**
+     * isPhysicalMethod
+     */
+    private Integer isPhysicalMethod;
+
+    /**
+     * tubesName
+     */
+    private String tubesName;
+
+    /**
+     * isTubes
+     */
+    private Integer isTubes;
+
+    /**
+     * col2Name
+     */
+    private String col2Name;
+
+    /**
+     * col2Am
+     */
+    private BigDecimal col2Am;
+
+    /**
+     * tubesStatus
+     */
+    private String tubesStatus;
+
+    /**
+     * boxTemp
+     */
+    private BigDecimal boxTemp;
+
+    /**
+     * boxHumi
+     */
+    private BigDecimal boxHumi;
+
+    /**
+     * urineColor
+     */
+    private String urineColor;
+
+    /**
+     * shitQuan
+     */
+    private BigDecimal shitQuan;
+
+    /**
+     * shitWaterQuan
+     */
+    private BigDecimal shitWaterQuan;
+
+    /**
+     * outputDblood
+     */
+    private BigDecimal outputDblood;
+
+    /**
+     * fHeartSound
+     */
+    private String fHeartSound;
+
+    /**
+     * fetalBreak
+     */
+    private String fetalBreak;
+
+    /**
+     * uterineOpen
+     */
+    private String uterineOpen;
+
+    /**
+     * uterineStatus
+     */
+    private String uterineStatus;
+
+    /**
+     * uterineHigh
+     */
+    private String uterineHigh;
+
+    /**
+     * uterineMove
+     */
+    private String uterineMove;
+
+    /**
+     * outBlood
+     */
+    private String outBlood;
+
+    /**
+     * redHurt
+     */
+    private String redHurt;
+
+    /**
+     * anusAir
+     */
+    private String anusAir;
+
+    /**
+     * suckleFun
+     */
+    private String suckleFun;
+
+    /**
+     * faceColour
+     */
+    private String faceColour;
+
+    /**
+     * skinColour
+     */
+    private String skinColour;
+
+    /**
+     * skinStatus
+     */
+    private String skinStatus;
+
+    /**
+     * urineQuan
+     */
+    private Integer urineQuan;
+
+    /**
+     * boxTempIn
+     */
+    private BigDecimal boxTempIn;
+
+    /**
+     * boxTempOut
+     */
+    private BigDecimal boxTempOut;
+
+    /**
+     * breath
+     */
+    private String breath;
+
+    /**
+     * acraStatus
+     */
+    private String acraStatus;
+
+    /**
+     * intakeFlag
+     */
+    private String intakeFlag;
+
+    /**
+     * outtakeFlag
+     */
+    private String outtakeFlag;
+
+    /**
+     * urineInfo
+     */
+    private String urineInfo;
+
+    /**
+     * intakeInfo
+     */
+    private String intakeInfo;
+
+    /**
+     * outputInfo
+     */
+    private String outputInfo;
+
+    /**
+     * pupilr
+     */
+    private String pupilr;
+
+    /**
+     * pupilbj
+     */
+    private String pupilbj;
+
+    /**
+     * fmTime
+     */
+    private Date fmTime;
+
+    /**
+     * csTime
+     */
+    private Date csTime;
+
+    /**
+     * fHeartSoundStr
+     */
+    private String fHeartSoundStr;
+
+    /**
+     * glu
+     */
+    private String glu;
+
+    /**
+     * painLvl
+     */
+    private String painLvl;
+
+    /**
+     * breatheMachine
+     */
+    private String breatheMachine;
+
+    /**
+     * map
+     */
+    private Integer map;
+
+    /**
+     * col1Srl
+     */
+    private String col1Srl;
+
+    /**
+     * gastric
+     */
+    private String gastric;
+
+    /**
+     * cvp
+     */
+    private String cvp;
+
+    /**
+     * etcho2
+     */
+    private String etcho2;
+
+    /**
+     * gcs
+     */
+    private String gcs;
+
+    /**
+     * rass
+     */
+    private String rass;
+
+    /**
+     * othJc
+     */
+    private String othJc;
+
+    /**
+     * position
+     */
+    private String position;
+
+    /**
+     * isBreath
+     */
+    private Integer isBreath;
+
+    /**
+     * isHuiyin
+     */
+    private Integer isHuiyin;
+
+    /**
+     * isBed
+     */
+    private Integer isBed;
+
+    /**
+     * isAV
+     */
+    private Integer isAV;
+
+    /**
+     * col1Dos
+     */
+    private String col1Dos;
+
+    /**
+     * ward
+     */
+    private String ward;
 
 }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -520,6 +520,7 @@ public class YiZhuLuRuServer {
         param.getList().forEach(item -> {
             fatherAndSonDoctorSAdvice.put(item.getId(), item);
             item.setActOrderNo(publicServer.getActOrderNo());
+            publicServer.orderRecord(item.getActOrderNo(), TokenUtil.getTokenUserId());
         });
         XinZhenYiZhu huanZheXinXi = dao.queryPatientInfo(param.getInpatientNo(), param.getAdmissTimes());
         // 把模板的数据插入到医嘱
@@ -977,6 +978,9 @@ public class YiZhuLuRuServer {
             }
             item.setDrugOcc(item.getDrugQuan());
         } else {
+            if (!groupList.contains(item.getGroupNo())) {
+                errorMessage.add("药房错误，请重新选择药房。");
+            }
             XinZhenYzActOrder detailsOfDrugs = drug.get(item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
             if (detailsOfDrugs != null) {
                 if (detailsOfDrugs.getDelFlag() == 1) {
@@ -985,12 +989,7 @@ public class YiZhuLuRuServer {
                 if (detailsOfDrugs.getYpLevel() > doctorLevel) {
                     errorMessage.add("您没有开此药品的权限");
                 }
-                if (ITEM.equals(item.getGroupNo().trim())) {
-                    errorMessage.add("药房错误请重新选择药房，");
-                }
-                if (!groupList.contains(item.getGroupNo())) {
-                    errorMessage.add("药房错误，请重新选择药房。");
-                }
+
                 if (StringUtil.isBlank(detailsOfDrugs.getNationalCode())) {
                     warningMessage.add("该药品没有医保编码");
                 }
@@ -1207,6 +1206,7 @@ public class YiZhuLuRuServer {
      * @param total        总数
      * @return 返回模板
      */
+    @DS("his")
     public ResultVo<IPage<YzOrderPattern>> huoQuYiZhuMuBan(String code, String deptCode, Integer muBanLeiXing, long currentPage, long total) {
         IPage<YzOrderPattern> page = new Page<>();
         if (total == 0) {
@@ -1240,6 +1240,7 @@ public class YiZhuLuRuServer {
      * @param code 模板的编码
      * @return 返回数据
      */
+    @DS("his")
     public ResultVo<List<YzActOrder>> huoQuMuBanShuJu(String code) {
         List<YzActOrder> muBanShuJu = dao.huoQuMuBanShuJu(code);
         Map<BigDecimal, YzActOrder> map = new HashMap<>(muBanShuJu.size());